Merge branch 'master' into bugs/463469-properties

247 files changed, 12707 insertions, 10346 deletions

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/META-INF/MANIFEST.MF b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/META-INF/MANIFEST.MF
index 2dbbf07343d..80131cb47bb 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/META-INF/MANIFEST.MF
@@ -3,20 +3,25 @@ Bundle-SymbolicName: org.eclipse.papyrus.umlrt.ui;singleton:=true
 Export-Package: org.eclipse.papyrus.umlrt.ui
 Bundle-Name: UML-RT UI plugin
 Bundle-Version: 1.1.0.qualifier
-Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.pa
- pyrus.uml.diagram.common;bundle-version="1.1.0",org.eclipse.papyrus.u
- mlrt;bundle-version="1.1.0",org.eclipse.papyrus.infra.newchild;bundle
- -version="1.1.0",org.eclipse.papyrus.infra.elementtypesconfigurations
- ;bundle-version="1.1.0",org.eclipse.emf.ecore,org.eclipse.uml2.uml,or
- g.eclipse.papyrus.emf.facet.efacet.core,org.eclipse.papyrus.emf.facet
- .query.java.core,org.eclipse.papyrus.uml.tools;bundle-version="1.1.0"
- ,org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",org.eclipse.pap
- yrus.emf.facet.custom.metamodel,org.eclipse.gmf.runtime.emf.type.core
- ;bundle-version="1.9.0",org.eclipse.papyrus.infra.core.log;bundle-ver
- sion="1.1.0",org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="
- 1.1.0",org.eclipse.papyrus.infra.services.labelprovider;bundle-versio
- n="1.1.0",org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1
- .1.0",org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0"
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.umlrt;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.newchild;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.0",
+ org.eclipse.emf.ecore,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0"
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.umlrt.ui.Activator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/newchildmenu/newChildMenu.xmi b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/newchildmenu/newChildMenu.xmi
index 59bbbef6f95..d4c241bd866 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/newchildmenu/newChildMenu.xmi
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/newchildmenu/newChildMenu.xmi
@@ -1,11 +1,35 @@
-<?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="UMLRealTime">

-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Capsule" elementTypeIdRef="org.eclipse.papyrus.umlrt.Capsule"/>

-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="CapsulePart" elementTypeIdRef="org.eclipse.papyrus.umlrt.CapsulePart"/>

-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Protocol" elementTypeIdRef="org.eclipse.papyrus.umlrt.Protocol"/>

-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="RTPort" elementTypeIdRef="org.eclipse.papyrus.umlrt.RTPort"/>

-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="RTConnector" elementTypeIdRef="org.eclipse.papyrus.umlrt.RTConnector"/>

-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="ProtocolContainer" elementTypeIdRef="org.eclipse.papyrus.umlrt.ProtocolContainer"/>

-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="RTRExcludedElement" elementTypeIdRef="org.eclipse.papyrus.umlrt.RTRExcludedElement"/>

-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="RTMessageSet" elementTypeIdRef="org.eclipse.papyrus.umlrt.RTMessageSet"/>

-</ElementCreationMenuModel:Folder>

+<?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="UMLRealTime">
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="Capsule"
+      elementTypeIdRef="org.eclipse.papyrus.umlrt.Capsule"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="CapsulePart"
+      elementTypeIdRef="org.eclipse.papyrus.umlrt.CapsulePart"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="Protocol"
+      elementTypeIdRef="org.eclipse.papyrus.umlrt.Protocol"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="RTPort"
+      elementTypeIdRef="org.eclipse.papyrus.umlrt.RTPort"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="RTConnector"
+      elementTypeIdRef="org.eclipse.papyrus.umlrt.RTConnector"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="ProtocolContainer"
+      elementTypeIdRef="org.eclipse.papyrus.umlrt.ProtocolContainer"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="RTRExcludedElement"
+      elementTypeIdRef="org.eclipse.papyrus.umlrt.RTRExcludedElement"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="RTMessageSet"
+      elementTypeIdRef="org.eclipse.papyrus.umlrt.RTMessageSet"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="In Message"
+      elementTypeIdRef="org.eclipse.papyrus.umlrt.OperationAsMessageIn"/>
+</ElementCreationMenuModel:Folder>
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF
index e48c112e068..fc19dd56c7b 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF
@@ -14,7 +14,10 @@ Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",
  org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.emf.type.core,
  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0"
+ org.eclipse.papyrus.dsml.validation;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -25,6 +28,8 @@ Export-Package: org.eclipse.papyrus.umlrt.UMLRealTime,
  org.eclipse.papyrus.umlrt.custom,
  org.eclipse.papyrus.umlrt.custom.advice,
  org.eclipse.papyrus.umlrt.custom.utils,
+ org.eclipse.papyrus.umlrt.custom.matcher,
+ org.eclipse.papyrus.umlrt.internals,
  org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach,
  org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl,
  org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.util
@@ -32,3 +37,4 @@ Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-ClassPath: .
 Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.papyrus.umlrt.internals.Activator
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations
index 1f6b9f13c6a..9c6ecf3130c 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations
@@ -1,270 +1,310 @@
-<?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="UMLRealTime"

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

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

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_ubJcsaeUEeSUR5jX0TaAcA"

-      name="Capsule"

-      identifier="org.eclipse.papyrus.umlrt.Capsule">

-    <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>UMLRealTime::Capsule</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_ubJctKeUEeSUR5jX0TaAcA"

-      name="CapsulePart"

-      identifier="org.eclipse.papyrus.umlrt.CapsulePart">

-    <iconEntry

-        xmi:id="_ubJctaeUEeSUR5jX0TaAcA"

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

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

-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

-    <matcherConfiguration

-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

-        xmi:id="_ubJctqeUEeSUR5jX0TaAcA">

-      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_ubJct6eUEeSUR5jX0TaAcA"

-      name="Protocol"

-      identifier="org.eclipse.papyrus.umlrt.Protocol">

-    <iconEntry

-        xmi:id="_ubJcuKeUEeSUR5jX0TaAcA"

-        iconPath="/icons/full/obj16/Collaboration.gif"

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

-    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>

-    <editHelperAdviceConfiguration

-        xmi:id="_Z9YkQM2BEeSdoOwgSyouYw"

-        name="org.eclipse.papyrus.umlrt.custom.advice.ProtocolEditHelperAdvice"

-        description="advice for Protocol"

-        identifier="org.eclipse.papyrus.umlrt.custom.advice.ProtocolEditHelperAdvice"

-        editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.ProtocolEditHelperAdvice"

-        inheritance="all"/>

-    <matcherConfiguration

-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

-        xmi:id="_ubJcuaeUEeSUR5jX0TaAcA">

-      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_ubJcuqeUEeSUR5jX0TaAcA"

-      name="RTPort"

-      identifier="org.eclipse.papyrus.umlrt.RTPort">

-    <iconEntry

-        xmi:id="_ubJcu6eUEeSUR5jX0TaAcA"

-        iconPath="/icons/full/obj16/Port.gif"

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

-    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>

-    <matcherConfiguration

-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

-        xmi:id="_ubJcvKeUEeSUR5jX0TaAcA">

-      <stereotypesQualifiedNames>UMLRealTime::RTPort</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_ubJcvaeUEeSUR5jX0TaAcA"

-      name="RTConnector"

-      identifier="org.eclipse.papyrus.umlrt.RTConnector">

-    <iconEntry

-        xmi:id="_ubJcvqeUEeSUR5jX0TaAcA"

-        iconPath="/icons/full/obj16/Connector.gif"

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

-    <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID>

-    <matcherConfiguration

-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

-        xmi:id="_ubJcv6eUEeSUR5jX0TaAcA">

-      <stereotypesQualifiedNames>UMLRealTime::RTConnector</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_ubJcwKeUEeSUR5jX0TaAcA"

-      name="ProtocolContainer"

-      identifier="org.eclipse.papyrus.umlrt.ProtocolContainer">

-    <iconEntry

-        xmi:id="_ubJcwaeUEeSUR5jX0TaAcA"

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

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

-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

-    <matcherConfiguration

-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

-        xmi:id="_ubJcwqeUEeSUR5jX0TaAcA">

-      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_ubJcw6eUEeSUR5jX0TaAcA"

-      name="RTRExcludedElement"

-      identifier="org.eclipse.papyrus.umlrt.RTRExcludedElement">

-    <iconEntry

-        xmi:id="_ubJcxKeUEeSUR5jX0TaAcA"

-        iconPath="/icons/full/obj16/RedefinableElement.gif"

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

-    <specializedTypesID>org.eclipse.papyrus.uml.RedefinableElement</specializedTypesID>

-    <matcherConfiguration

-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

-        xmi:id="_ubJcxaeUEeSUR5jX0TaAcA">

-      <stereotypesQualifiedNames>UMLRealTime::RTRExcludedElement</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_ubJcxqeUEeSUR5jX0TaAcA"

-      name="RTMessageSet"

-      identifier="org.eclipse.papyrus.umlrt.RTMessageSet">

-    <iconEntry

-        xmi:id="_ubJcx6eUEeSUR5jX0TaAcA"

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

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

-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

-    <matcherConfiguration

-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

-        xmi:id="_ubJcyKeUEeSUR5jX0TaAcA">

-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_At0JAONwEeSMDu6IBsn9eg"

-      name="Operation"

-      identifier="org.eclipse.papyrus.umlrt.Operation">

-    <iconEntry

-        xmi:id="_At0JAeNwEeSMDu6IBsn9eg"

-        iconPath="/icons/full/obj16/Operation.gif"

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

-    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>

-    <editHelperAdviceConfiguration

-        xmi:id="_At0JAuNwEeSMDu6IBsn9eg"

-        name="org.eclipse.papyrus.umlrt.custom.advice.OperationEditHelperAdvice"

-        description="advice for Operation"

-        identifier="org.eclipse.papyrus.umlrt.custom.advice.OperationEditHelperAdvice"

-        editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.OperationEditHelperAdvice"

-        inheritance="all"/>

-  </elementTypeConfigurations>

-  <adviceBindingsConfigurations

-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"

-      xmi:id="_ubJcyaeUEeSUR5jX0TaAcA"

-      name="Apply Capsule"

-      identifier="org.eclipse.papyrus.umlrt.capsule"

-      target="_ubJcsaeUEeSUR5jX0TaAcA">

-    <stereotypesToApply

-        xmi:id="_ubJcyqeUEeSUR5jX0TaAcA"

-        stereotypeQualifiedName="UMLRealTime::Capsule"

-        updateName="true">

-      <requiredProfiles>UMLRealTime</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations

-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"

-      xmi:id="_ubJcy6eUEeSUR5jX0TaAcA"

-      name="Apply CapsulePart"

-      identifier="org.eclipse.papyrus.umlrt.capsulePart"

-      target="_ubJctKeUEeSUR5jX0TaAcA">

-    <stereotypesToApply

-        xmi:id="_ubJczKeUEeSUR5jX0TaAcA"

-        stereotypeQualifiedName="UMLRealTime::CapsulePart"

-        updateName="true">

-      <requiredProfiles>UMLRealTime</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations

-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"

-      xmi:id="_ubJczaeUEeSUR5jX0TaAcA"

-      name="Apply Protocol"

-      identifier="org.eclipse.papyrus.umlrt.protocol"

-      target="_ubJct6eUEeSUR5jX0TaAcA">

-    <stereotypesToApply

-        xmi:id="_ubJczqeUEeSUR5jX0TaAcA"

-        stereotypeQualifiedName="UMLRealTime::Protocol"

-        updateName="true">

-      <requiredProfiles>UMLRealTime</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations

-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"

-      xmi:id="_ubJcz6eUEeSUR5jX0TaAcA"

-      name="Apply RTPort"

-      identifier="org.eclipse.papyrus.umlrt.rTPort"

-      target="_ubJcuqeUEeSUR5jX0TaAcA">

-    <stereotypesToApply

-        xmi:id="_ubJc0KeUEeSUR5jX0TaAcA"

-        stereotypeQualifiedName="UMLRealTime::RTPort"

-        updateName="true">

-      <requiredProfiles>UMLRealTime</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations

-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"

-      xmi:id="_ubJc0aeUEeSUR5jX0TaAcA"

-      name="Apply RTConnector"

-      identifier="org.eclipse.papyrus.umlrt.rTConnector"

-      target="_ubJcvaeUEeSUR5jX0TaAcA">

-    <stereotypesToApply

-        xmi:id="_ubJc0qeUEeSUR5jX0TaAcA"

-        stereotypeQualifiedName="UMLRealTime::RTConnector"

-        updateName="true">

-      <requiredProfiles>UMLRealTime</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations

-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"

-      xmi:id="_ubJc06eUEeSUR5jX0TaAcA"

-      name="Apply ProtocolContainer"

-      identifier="org.eclipse.papyrus.umlrt.protocolContainer"

-      target="_ubJcwKeUEeSUR5jX0TaAcA">

-    <stereotypesToApply

-        xmi:id="_ubJc1KeUEeSUR5jX0TaAcA"

-        stereotypeQualifiedName="UMLRealTime::ProtocolContainer"

-        updateName="true">

-      <requiredProfiles>UMLRealTime</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations

-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"

-      xmi:id="_ubJc1aeUEeSUR5jX0TaAcA"

-      name="Apply RTRExcludedElement"

-      identifier="org.eclipse.papyrus.umlrt.rTRExcludedElement"

-      target="_ubJcw6eUEeSUR5jX0TaAcA">

-    <stereotypesToApply

-        xmi:id="_ubJc1qeUEeSUR5jX0TaAcA"

-        stereotypeQualifiedName="UMLRealTime::RTRExcludedElement"

-        updateName="true">

-      <requiredProfiles>UMLRealTime</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations

-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"

-      xmi:id="_ubJc16eUEeSUR5jX0TaAcA"

-      name="Apply RTMessageSet"

-      identifier="org.eclipse.papyrus.umlrt.rTMessageSet"

-      target="_ubJcxqeUEeSUR5jX0TaAcA">

-    <stereotypesToApply

-        xmi:id="_ubJc2KeUEeSUR5jX0TaAcA"

-        stereotypeQualifiedName="UMLRealTime::RTMessageSet"

-        updateName="true">

-      <requiredProfiles>UMLRealTime</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

+<?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="UMLRealTime"
+    identifier="org.eclipse.papyrus.umlrt.elementTypes"
+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_ubJcsaeUEeSUR5jX0TaAcA"
+      name="Capsule"
+      identifier="org.eclipse.papyrus.umlrt.Capsule">
+    <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>UMLRealTime::Capsule</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_ubJctKeUEeSUR5jX0TaAcA"
+      name="CapsulePart"
+      identifier="org.eclipse.papyrus.umlrt.CapsulePart">
+    <iconEntry
+        xmi:id="_ubJctaeUEeSUR5jX0TaAcA"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
+    <matcherConfiguration
+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
+        xmi:id="_ubJctqeUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_ubJct6eUEeSUR5jX0TaAcA"
+      name="Protocol"
+      identifier="org.eclipse.papyrus.umlrt.Protocol">
+    <iconEntry
+        xmi:id="_ubJcuKeUEeSUR5jX0TaAcA"
+        iconPath="/icons/full/obj16/Collaboration.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>
+    <editHelperAdviceConfiguration
+        xmi:id="_Z9YkQM2BEeSdoOwgSyouYw"
+        name="org.eclipse.papyrus.umlrt.custom.advice.ProtocolEditHelperAdvice"
+        description="advice for Protocol"
+        identifier="org.eclipse.papyrus.umlrt.custom.advice.ProtocolEditHelperAdvice"
+        editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.ProtocolEditHelperAdvice"
+        inheritance="all"/>
+    <matcherConfiguration
+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
+        xmi:id="_ubJcuaeUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_ubJcuqeUEeSUR5jX0TaAcA"
+      name="RTPort"
+      identifier="org.eclipse.papyrus.umlrt.RTPort">
+    <iconEntry
+        xmi:id="_ubJcu6eUEeSUR5jX0TaAcA"
+        iconPath="/icons/full/obj16/Port.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
+    <matcherConfiguration
+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
+        xmi:id="_ubJcvKeUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>UMLRealTime::RTPort</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_ubJcvaeUEeSUR5jX0TaAcA"
+      name="RTConnector"
+      identifier="org.eclipse.papyrus.umlrt.RTConnector">
+    <iconEntry
+        xmi:id="_ubJcvqeUEeSUR5jX0TaAcA"
+        iconPath="/icons/full/obj16/Connector.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID>
+    <matcherConfiguration
+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
+        xmi:id="_ubJcv6eUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>UMLRealTime::RTConnector</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_ubJcwKeUEeSUR5jX0TaAcA"
+      name="ProtocolContainer"
+      identifier="org.eclipse.papyrus.umlrt.ProtocolContainer">
+    <iconEntry
+        xmi:id="_ubJcwaeUEeSUR5jX0TaAcA"
+        iconPath="/icons/full/obj16/Package.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
+    <editHelperAdviceConfiguration
+        xmi:id="_5m7RcOc2EeSW0_lDigZ13g"
+        name="Protocol Container Advice"
+        identifier="org.eclipse.papyrus.umlrt.ProcotolContainerAdvice"
+        editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.ProtocolContainerEditHelperAdvice"
+        inheritance="all"/>
+    <matcherConfiguration
+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
+        xmi:id="_ubJcwqeUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_ubJcw6eUEeSUR5jX0TaAcA"
+      name="RTRExcludedElement"
+      identifier="org.eclipse.papyrus.umlrt.RTRExcludedElement">
+    <iconEntry
+        xmi:id="_ubJcxKeUEeSUR5jX0TaAcA"
+        iconPath="/icons/full/obj16/RedefinableElement.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.RedefinableElement</specializedTypesID>
+    <matcherConfiguration
+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
+        xmi:id="_ubJcxaeUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>UMLRealTime::RTRExcludedElement</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_ubJcxqeUEeSUR5jX0TaAcA"
+      name="RTMessageSet"
+      identifier="org.eclipse.papyrus.umlrt.RTMessageSet">
+    <iconEntry
+        xmi:id="_ubJcx6eUEeSUR5jX0TaAcA"
+        iconPath="/icons/full/obj16/Interface.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
+    <editHelperAdviceConfiguration
+        xmi:id="_1caKcOUVEeSW0_lDigZ13g"
+        name="org.eclipse.papyrus.umlrt.custom.advice.MessageSetEditHelperAdvice"
+        description="Edit helper advice on "
+        identifier="org.eclipse.papyrus.umlrt.custom.advice.MessageSetEditHelperAdvice"
+        editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.MessageSetEditHelperAdvice"/>
+    <matcherConfiguration
+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
+        xmi:id="_ubJcyKeUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_At0JAONwEeSMDu6IBsn9eg"
+      name="Operation"
+      identifier="org.eclipse.papyrus.umlrt.OperationAsMessage">
+    <iconEntry
+        xmi:id="_At0JAeNwEeSMDu6IBsn9eg"
+        iconPath="/icons/full/obj16/Operation.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
+    <editHelperAdviceConfiguration
+        xmi:id="_At0JAuNwEeSMDu6IBsn9eg"
+        name="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageEditHelperAdvice"
+        description="advice for Operation"
+        identifier="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageEditHelperAdvice"
+        editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageEditHelperAdvice"
+        inheritance="all"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_1puuMOToEeSW0_lDigZ13g"
+      name="Operation As Message IN"
+      identifier="org.eclipse.papyrus.umlrt.OperationAsMessageIn">
+    <iconEntry
+        xmi:id="_7aYeMOToEeSW0_lDigZ13g"
+        iconPath="/icons/full/obj16/Operation.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umlrt.OperationAsMessage</specializedTypesID>
+    <editHelperAdviceConfiguration
+        xmi:id="_7aZFQOToEeSW0_lDigZ13g"
+        name="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageInEditHelperAdvice"
+        description="advice for Operation as Message IN"
+        identifier="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageInEditHelperAdvice"
+        editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageInEditHelperAdvice"
+        inheritance="all"/>
+  </elementTypeConfigurations>
+  <adviceBindingsConfigurations
+      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
+      xmi:id="_ubJcyaeUEeSUR5jX0TaAcA"
+      name="Apply Capsule"
+      identifier="org.eclipse.papyrus.umlrt.capsule"
+      target="_ubJcsaeUEeSUR5jX0TaAcA">
+    <stereotypesToApply
+        xmi:id="_ubJcyqeUEeSUR5jX0TaAcA"
+        stereotypeQualifiedName="UMLRealTime::Capsule"
+        updateName="true">
+      <requiredProfiles>UMLRealTime</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations
+      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
+      xmi:id="_ubJcy6eUEeSUR5jX0TaAcA"
+      name="Apply CapsulePart"
+      identifier="org.eclipse.papyrus.umlrt.capsulePart"
+      target="_ubJctKeUEeSUR5jX0TaAcA">
+    <stereotypesToApply
+        xmi:id="_ubJczKeUEeSUR5jX0TaAcA"
+        stereotypeQualifiedName="UMLRealTime::CapsulePart"
+        updateName="true">
+      <requiredProfiles>UMLRealTime</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations
+      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
+      xmi:id="_ubJczaeUEeSUR5jX0TaAcA"
+      name="Apply Protocol"
+      identifier="org.eclipse.papyrus.umlrt.protocol"
+      target="_ubJct6eUEeSUR5jX0TaAcA">
+    <stereotypesToApply
+        xmi:id="_ubJczqeUEeSUR5jX0TaAcA"
+        stereotypeQualifiedName="UMLRealTime::Protocol"
+        updateName="true">
+      <requiredProfiles>UMLRealTime</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations
+      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
+      xmi:id="_ubJcz6eUEeSUR5jX0TaAcA"
+      name="Apply RTPort"
+      identifier="org.eclipse.papyrus.umlrt.rTPort"
+      target="_ubJcuqeUEeSUR5jX0TaAcA">
+    <stereotypesToApply
+        xmi:id="_ubJc0KeUEeSUR5jX0TaAcA"
+        stereotypeQualifiedName="UMLRealTime::RTPort"
+        updateName="true">
+      <requiredProfiles>UMLRealTime</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations
+      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
+      xmi:id="_ubJc0aeUEeSUR5jX0TaAcA"
+      name="Apply RTConnector"
+      identifier="org.eclipse.papyrus.umlrt.rTConnector"
+      target="_ubJcvaeUEeSUR5jX0TaAcA">
+    <stereotypesToApply
+        xmi:id="_ubJc0qeUEeSUR5jX0TaAcA"
+        stereotypeQualifiedName="UMLRealTime::RTConnector"
+        updateName="true">
+      <requiredProfiles>UMLRealTime</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations
+      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
+      xmi:id="_ubJc06eUEeSUR5jX0TaAcA"
+      name="Apply ProtocolContainer"
+      identifier="org.eclipse.papyrus.umlrt.protocolContainer"
+      target="_ubJcwKeUEeSUR5jX0TaAcA">
+    <stereotypesToApply
+        xmi:id="_ubJc1KeUEeSUR5jX0TaAcA"
+        stereotypeQualifiedName="UMLRealTime::ProtocolContainer"
+        updateName="true">
+      <requiredProfiles>UMLRealTime</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations
+      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
+      xmi:id="_ubJc1aeUEeSUR5jX0TaAcA"
+      name="Apply RTRExcludedElement"
+      identifier="org.eclipse.papyrus.umlrt.rTRExcludedElement"
+      target="_ubJcw6eUEeSUR5jX0TaAcA">
+    <stereotypesToApply
+        xmi:id="_ubJc1qeUEeSUR5jX0TaAcA"
+        stereotypeQualifiedName="UMLRealTime::RTRExcludedElement"
+        updateName="true">
+      <requiredProfiles>UMLRealTime</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations
+      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
+      xmi:id="_ubJc16eUEeSUR5jX0TaAcA"
+      name="Apply RTMessageSet"
+      identifier="org.eclipse.papyrus.umlrt.rTMessageSet"
+      target="_ubJcxqeUEeSUR5jX0TaAcA">
+    <stereotypesToApply
+        xmi:id="_ubJc2KeUEeSUR5jX0TaAcA"
+        stereotypeQualifiedName="UMLRealTime::RTMessageSet"
+        updateName="true">
+      <requiredProfiles>UMLRealTime</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations
+      xmi:id="_Mb9lIOc0EeSW0_lDigZ13g"
+      name="org.eclipse.papyrus.umlrt.custom.advice.BehavioredClassifierEditHelperAdvice"
+      identifier="org.eclipse.papyrus.umlrt.custom.advice.BehavioredClassifierEditHelperAdvice"
+      editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.BehavioredClassifierEditHelperAdvice"
+      inheritance="all">
+    <target
+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
+        href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNtlYCEeS0WsAAtVmToA"/>
+  </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
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
index 5a9229528b1..0c75acb2097 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations
@@ -1,534 +1,534 @@
-<?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>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_UKFswON2EeSMDu6IBsn9eg"

-      name="Operation (3003)"

-      identifier="org.eclipse.papyrus.umlrt.Operation_3003"

-      hint="3003">

-    <iconEntry

-        xmi:id="_UKFsweN2EeSMDu6IBsn9eg"

-        iconPath="/icons/full/obj16/Operation.gif"

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

-    <specializedTypesID>org.eclipse.papyrus.umlrt.Operation</specializedTypesID>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3003</specializedTypesID>

-    <matcherConfiguration

-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

-        xmi:id="_UKFswuN2EeSMDu6IBsn9eg">

-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_iggYsON2EeSMDu6IBsn9eg"

-      name="Operation (3007)"

-      identifier="org.eclipse.papyrus.umlrt.Operation_3007"

-      hint="3007">

-    <iconEntry

-        xmi:id="_iggYseN2EeSMDu6IBsn9eg"

-        iconPath="/icons/full/obj16/Operation.gif"

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

-    <specializedTypesID>org.eclipse.papyrus.umlrt.Operation</specializedTypesID>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3007</specializedTypesID>

-    <matcherConfiguration

-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

-        xmi:id="_iggYsuN2EeSMDu6IBsn9eg">

-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_nR6SMON2EeSMDu6IBsn9eg"

-      name="Operation (3013)"

-      identifier="org.eclipse.papyrus.umlrt.Operation_3013"

-      hint="3013">

-    <iconEntry

-        xmi:id="_nR6SMeN2EeSMDu6IBsn9eg"

-        iconPath="/icons/full/obj16/Operation.gif"

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

-    <specializedTypesID>org.eclipse.papyrus.umlrt.Operation</specializedTypesID>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3013</specializedTypesID>

-    <matcherConfiguration

-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

-        xmi:id="_nR6SMuN2EeSMDu6IBsn9eg">

-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_sqMlgON2EeSMDu6IBsn9eg"

-      name="Operation (3019)"

-      identifier="org.eclipse.papyrus.umlrt.Operation_3019"

-      hint="3019">

-    <iconEntry

-        xmi:id="_sqMlgeN2EeSMDu6IBsn9eg"

-        iconPath="/icons/full/obj16/Operation.gif"

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

-    <specializedTypesID>org.eclipse.papyrus.umlrt.Operation</specializedTypesID>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3019</specializedTypesID>

-    <matcherConfiguration

-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

-        xmi:id="_sqMlguN2EeSMDu6IBsn9eg">

-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_xQYGcON2EeSMDu6IBsn9eg"

-      name="Operation (3042)"

-      identifier="org.eclipse.papyrus.umlrt.Operation_3042"

-      hint="3042">

-    <iconEntry

-        xmi:id="_xQYGceN2EeSMDu6IBsn9eg"

-        iconPath="/icons/full/obj16/Operation.gif"

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

-    <specializedTypesID>org.eclipse.papyrus.umlrt.Operation</specializedTypesID>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3042</specializedTypesID>

-    <matcherConfiguration

-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

-        xmi:id="_xQYGcuN2EeSMDu6IBsn9eg">

-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

+<?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>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_UKFswON2EeSMDu6IBsn9eg"
+      name="Operation (3003)"
+      identifier="org.eclipse.papyrus.umlrt.Operation_3003"
+      hint="3003">
+    <iconEntry
+        xmi:id="_UKFsweN2EeSMDu6IBsn9eg"
+        iconPath="/icons/full/obj16/Operation.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umlrt.OperationAsMessage</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3003</specializedTypesID>
+    <matcherConfiguration
+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
+        xmi:id="_UKFswuN2EeSMDu6IBsn9eg">
+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_iggYsON2EeSMDu6IBsn9eg"
+      name="Operation (3007)"
+      identifier="org.eclipse.papyrus.umlrt.Operation_3007"
+      hint="3007">
+    <iconEntry
+        xmi:id="_iggYseN2EeSMDu6IBsn9eg"
+        iconPath="/icons/full/obj16/Operation.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umlrt.OperationAsMessage</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3007</specializedTypesID>
+    <matcherConfiguration
+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
+        xmi:id="_iggYsuN2EeSMDu6IBsn9eg">
+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_nR6SMON2EeSMDu6IBsn9eg"
+      name="Operation (3013)"
+      identifier="org.eclipse.papyrus.umlrt.Operation_3013"
+      hint="3013">
+    <iconEntry
+        xmi:id="_nR6SMeN2EeSMDu6IBsn9eg"
+        iconPath="/icons/full/obj16/Operation.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umlrt.OperationAsMessage</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3013</specializedTypesID>
+    <matcherConfiguration
+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
+        xmi:id="_nR6SMuN2EeSMDu6IBsn9eg">
+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_sqMlgON2EeSMDu6IBsn9eg"
+      name="Operation (3019)"
+      identifier="org.eclipse.papyrus.umlrt.Operation_3019"
+      hint="3019">
+    <iconEntry
+        xmi:id="_sqMlgeN2EeSMDu6IBsn9eg"
+        iconPath="/icons/full/obj16/Operation.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umlrt.OperationAsMessage</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3019</specializedTypesID>
+    <matcherConfiguration
+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
+        xmi:id="_sqMlguN2EeSMDu6IBsn9eg">
+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_xQYGcON2EeSMDu6IBsn9eg"
+      name="Operation (3042)"
+      identifier="org.eclipse.papyrus.umlrt.Operation_3042"
+      hint="3042">
+    <iconEntry
+        xmi:id="_xQYGceN2EeSMDu6IBsn9eg"
+        iconPath="/icons/full/obj16/Operation.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umlrt.OperationAsMessage</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3042</specializedTypesID>
+    <matcherConfiguration
+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
+        xmi:id="_xQYGcuN2EeSMDu6IBsn9eg">
+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/IUMLRTElementTypes.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/IUMLRTElementTypes.java
index 2e676f1aa28..0814eabe2ab 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/IUMLRTElementTypes.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/IUMLRTElementTypes.java
@@ -32,4 +32,6 @@ public interface IUMLRTElementTypes {
 	public static final String RT_CONNECTOR_ID = "org.eclipse.papyrus.umlrt.RTConnector";//$NON-NLS-1$
 	
 	public static final String RT_EXCLUDED_ELEMENT_ID = "org.eclipse.papyrus.umlrt.RTRExcludedElement";//$NON-NLS-1$
+
+	public static final String RT_OPERATION_AS_MESSAGE = "org.eclipse.papyrus.umlrt.OperationAsMessage";
 }
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/UMLRTElementTypesEnumerator.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/UMLRTElementTypesEnumerator.java
index 2832332b7ff..000a1bf2340 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/UMLRTElementTypesEnumerator.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/UMLRTElementTypesEnumerator.java
@@ -39,7 +39,7 @@ public class UMLRTElementTypesEnumerator extends AbstractElementTypeEnumerator i
 
 	public static final IHintedType RT_EXCLUDED_ELEMENT = (IHintedType) getElementType(RT_EXCLUDED_ELEMENT_ID);
 
-	public static final List<IHintedType> rtTypes = Arrays.asList(RT_MESSAGE_SET, PROTOCOL_CONTAINER, PROTOCOL, CAPSULE, CAPSULE_PART, RT_PORT, RT_CONNECTOR, RT_EXCLUDED_ELEMENT);
+	private static final List<IHintedType> rtTypes = Arrays.asList(RT_MESSAGE_SET, PROTOCOL_CONTAINER, PROTOCOL, CAPSULE, CAPSULE_PART, RT_PORT, RT_CONNECTOR, RT_EXCLUDED_ELEMENT);
 
 	/**
 	 * Returns all the specific semantic element types for UML-RT
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/BehavioredClassifierEditHelperAdvice.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/BehavioredClassifierEditHelperAdvice.java
new file mode 100644
index 00000000000..82e7a317a98
--- /dev/null
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/BehavioredClassifierEditHelperAdvice.java
@@ -0,0 +1,72 @@
+/*****************************************************************************
+ * 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.umlrt.custom.advice;
+
+import java.util.Arrays;
+import java.util.List;
+
+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.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.umlrt.custom.IUMLRTElementTypes;
+import org.eclipse.papyrus.umlrt.internals.Activator;
+
+/**
+ * Edit helper advice to forbid the creation of OperationAsMessages in Any behaviored classifier except the MessageSet kinds
+ */
+public class BehavioredClassifierEditHelperAdvice extends AbstractEditHelperAdvice {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean approveRequest(IEditCommandRequest request) {
+		// do not allow to create a children to MessageSets other than operations (Messages)
+		if (request instanceof CreateElementRequest) {
+			CreateElementRequest createElementRequest = ((CreateElementRequest) request);
+			// retrieve element type from this request and check if this is a kind of UMLRT::Message
+			IElementType type = createElementRequest.getElementType();
+
+			// type should only be compatible with UMLRT::OperationAsMessages
+			IElementType umlRTMessageType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.RT_OPERATION_AS_MESSAGE);
+			// should not be null, otherwise, element type model is not loaded correctly. abort.
+			if (umlRTMessageType == null) {
+				Activator.log.debug("MessageAsOperation element type is not accessible");
+				return super.approveRequest(request);
+			}
+
+			// check type is compatible with UMLRT::OperationAsMessages
+			List<IElementType> types = Arrays.asList(type.getAllSuperTypes());
+			// element to create is not a rt message, no need to do something on that part...
+			if (!types.contains(umlRTMessageType)) {
+				return super.approveRequest(request);
+			}
+			// element to create is a RT message. The behaviored classifier should be a MessageSet...
+			IElementType messageSetType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.RT_MESSAGE_SET_ID);
+			if (!(messageSetType instanceof ISpecializationType)) {
+				return super.approveRequest(request);
+			} else {
+				if(!((ISpecializationType)messageSetType).getMatcher().matches(createElementRequest.getContainer())) {
+					return false;
+				}
+			}
+			return super.approveRequest(request);
+		}
+
+		return super.approveRequest(request);
+	}
+}
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/MessageSetEditHelperAdvice.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/MessageSetEditHelperAdvice.java
new file mode 100644
index 00000000000..39d0e9cb2b2
--- /dev/null
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/MessageSetEditHelperAdvice.java
@@ -0,0 +1,72 @@
+/*****************************************************************************
+ * 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: Onder Gurcan <onder.gurcan@cea.fr>
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.umlrt.custom.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.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.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.umlrt.custom.IUMLRTElementTypes;
+import org.eclipse.papyrus.umlrt.internals.Activator;
+
+
+/**
+ * The helper advice class used for UMLRealTime::MessageSets.
+ */
+public class MessageSetEditHelperAdvice extends AbstractEditHelperAdvice {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getAfterEditContextCommand(GetEditContextRequest request) {
+		return super.getAfterEditContextCommand(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean approveRequest(IEditCommandRequest request) {
+
+		// do not allow to create a children to MessageSets other than operations (Messages)
+		if (request instanceof CreateElementRequest) {
+			CreateElementRequest createElementRequest = ((CreateElementRequest) request);
+			// retrieve element type from this request and check if this is a kind of UMLRT::Message
+			IElementType type = createElementRequest.getElementType();
+
+			// type should only be compatible with UMLRT::OperationAsMessages
+			IElementType umlRTMessageType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.RT_OPERATION_AS_MESSAGE);
+			// should not be null, otherwise, element type model is not loaded correctly. abort.
+			if (umlRTMessageType == null) {
+				Activator.log.debug("MessageAsOperation element type is not accessible");
+				return super.approveRequest(request);
+			}
+
+			// check type is compatible with UMLRT::OperationAsMessages
+			List<IElementType> types = Arrays.asList(type.getAllSuperTypes());
+			if (!types.contains(umlRTMessageType)) {
+				return false;
+			}
+			return super.approveRequest(request);
+		}
+		return super.approveRequest(request);
+	}
+}
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/OperationEditHelperAdvice.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/OperationAsMessageEditHelperAdvice.java
index 0a3c0dcdcec..8a426bd509a 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/OperationEditHelperAdvice.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/OperationAsMessageEditHelperAdvice.java
@@ -1,126 +1,126 @@
-/*****************************************************************************

- * 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: Onder Gurcan <onder.gurcan@cea.fr>

- *

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

-

-package org.eclipse.papyrus.umlrt.custom.advice;

-

-import static org.eclipse.papyrus.uml.service.types.element.UMLElementTypes.CALL_EVENT;

-

-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.ConfigureElementCommand;

-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.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;

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

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

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

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

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

-

-

-/**

- * The helperadvice class used for UMLRealTime::Operation.

- *

- * @author Onder Gurcan <onder.gurcan@cea.fr>

- *

- */

-public class OperationEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	private CallEvent callEvent;

-

-	private enum Relation {

-		CHILD, SIBLING, PARENT;

-	}

-

-	/**

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeConfigureCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {

-		final Operation operation = (Operation) request.getElementToConfigure();

-		final String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("CallEvent", operation.eContainer().eContainer().eContents());

-

-		return new ConfigureElementCommand(request) {

-			private IProgressMonitor progressMonitor;

-			private IAdaptable info;

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				this.progressMonitor = progressMonitor;

-				this.info = info;

-

-				// Create the UML::CallEvent element

-				createCallEvent(operation, name);

-

-				return CommandResult.newOKCommandResult(operation);

-			}

-

-			/**

-			 * Creates a UML::Usage relation between protocol and rtMessageSet with given name.

-			 *

-			 * @param protocol

-			 * @param name

-			 * @param rtMessageSet

-			 * @throws ExecutionException

-			 */

-			private void createCallEvent(final Operation operation, final String name) throws ExecutionException {

-				// find the corresponding protocol container

-				Package protocolContainer = operation.getNearestPackage();

-				// then create the call event

-				callEvent = (CallEvent) createElement(protocolContainer, name, CALL_EVENT, Relation.CHILD);

-				// finally associate the operation with this call event

-				callEvent.setOperation(operation);

-			}

-

-			/**

-			 *

-			 * @param referenceElement

-			 * @param name

-			 * @param elementType

-			 * @param relation

-			 * @return created element as EObject

-			 * @throws ExecutionException

-			 */

-			private EObject createElement(Element referenceElement, String name, IElementType elementType, Relation relation) throws ExecutionException {

-				if ((referenceElement == null) || (name == null)) {

-					throw new ExecutionException("Either the referenceElement or the name parameter is null. ");

-				}

-

-				EObject newElement = null;

-

-				CreateElementRequest createElementRequest = new CreateElementRequest(referenceElement.getNearestPackage(), elementType);

-				CreateElementCommand command = new CreateElementCommand(createElementRequest);

-				command.execute(progressMonitor, info);

-				newElement = command.getNewElement();

-

-				if (newElement == null) {

-					throw new ExecutionException("Element creation problem for " + elementType.getDisplayName() + ".");

-				}

-

-				((NamedElement)newElement).setName(name);

-

-				return newElement;

-			}

-		};

-	}

-}

+/*****************************************************************************
+ * 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: Onder Gurcan <onder.gurcan@cea.fr>
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.umlrt.custom.advice;
+
+import static org.eclipse.papyrus.uml.service.types.element.UMLElementTypes.CALL_EVENT;
+
+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.ConfigureElementCommand;
+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.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
+import org.eclipse.uml2.uml.CallEvent;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Package;
+
+
+/**
+ * The helperadvice class used for UMLRealTime::Operation.
+ *
+ * @author Onder Gurcan <onder.gurcan@cea.fr>
+ *
+ */
+public class OperationAsMessageEditHelperAdvice extends AbstractEditHelperAdvice {
+
+	private CallEvent callEvent;
+
+	private enum Relation {
+		CHILD, SIBLING, PARENT;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeConfigureCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
+		final Operation operation = (Operation) request.getElementToConfigure();
+		final String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("CallEvent", operation.eContainer().eContainer().eContents());
+
+		return new ConfigureElementCommand(request) {
+			private IProgressMonitor progressMonitor;
+			private IAdaptable info;
+
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+				this.progressMonitor = progressMonitor;
+				this.info = info;
+
+				// Create the UML::CallEvent element
+				createCallEvent(operation, name);
+
+				return CommandResult.newOKCommandResult(operation);
+			}
+
+			/**
+			 * Creates a UML::Usage relation between protocol and rtMessageSet with given name.
+			 *
+			 * @param protocol
+			 * @param name
+			 * @param rtMessageSet
+			 * @throws ExecutionException
+			 */
+			private void createCallEvent(final Operation operation, final String name) throws ExecutionException {
+				// find the corresponding protocol container
+				Package protocolContainer = operation.getNearestPackage();
+				// then create the call event
+				callEvent = (CallEvent) createElement(protocolContainer, name, CALL_EVENT, Relation.CHILD);
+				// finally associate the operation with this call event
+				callEvent.setOperation(operation);
+			}
+
+			/**
+			 *
+			 * @param referenceElement
+			 * @param name
+			 * @param elementType
+			 * @param relation
+			 * @return created element as EObject
+			 * @throws ExecutionException
+			 */
+			private EObject createElement(Element referenceElement, String name, IElementType elementType, Relation relation) throws ExecutionException {
+				if ((referenceElement == null) || (name == null)) {
+					throw new ExecutionException("Either the referenceElement or the name parameter is null. ");
+				}
+
+				EObject newElement = null;
+
+				CreateElementRequest createElementRequest = new CreateElementRequest(referenceElement.getNearestPackage(), elementType);
+				CreateElementCommand command = new CreateElementCommand(createElementRequest);
+				command.execute(progressMonitor, info);
+				newElement = command.getNewElement();
+
+				if (newElement == null) {
+					throw new ExecutionException("Element creation problem for " + elementType.getDisplayName() + ".");
+				}
+
+				((NamedElement)newElement).setName(name);
+
+				return newElement;
+			}
+		};
+	}
+}
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/OperationAsMessageInEditHelperAdvice.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/OperationAsMessageInEditHelperAdvice.java
new file mode 100644
index 00000000000..4f25c453e78
--- /dev/null
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/OperationAsMessageInEditHelperAdvice.java
@@ -0,0 +1,96 @@
+/*****************************************************************************
+ * 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.umlrt.custom.advice;
+
+import org.eclipse.emf.ecore.EObject;
+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.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.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageKind;
+import org.eclipse.papyrus.umlrt.custom.IUMLRTElementTypes;
+import org.eclipse.papyrus.umlrt.custom.utils.MessageSetUtils;
+import org.eclipse.uml2.uml.Interface;
+
+/**
+ * Specialization of the Operation as message in message sets, but specific to message sets with kind=IN
+ */
+public class OperationAsMessageInEditHelperAdvice extends OperationAsMessageEditHelperAdvice {
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public boolean approveRequest(IEditCommandRequest request) {
+		if (request instanceof CreateElementRequest) {
+			// check container.
+			EObject container = ((CreateElementRequest) request).getContainer();
+			if (!(container instanceof Interface)) {
+				return false;
+			}
+
+			IElementType messageSetType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.RT_MESSAGE_SET_ID);
+			if (messageSetType instanceof ISpecializationType) { // check at the same time UMLRT element types are correctly loaded
+				if (!((ISpecializationType) messageSetType).getMatcher().matches(container)) {
+					return false;
+				}
+
+				// this is really a message set. Should go for the kind
+				if (RTMessageKind.IN == MessageSetUtils.getMessageKind(container)) {
+					return true;
+				}
+			}
+
+			// should not be possible to create except RT interface
+			return false;
+		}
+
+
+		return super.approveRequest(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {
+		// check container.
+		EObject container = request.getContainer();
+		if (!(container instanceof Interface)) {
+			return UnexecutableCommand.INSTANCE;
+		}
+
+		IElementType messageSetType= ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.RT_MESSAGE_SET_ID);
+		if (messageSetType instanceof ISpecializationType) { // check at the same time UMLRT element types are correctly loaded
+			if (!((ISpecializationType) messageSetType).getMatcher().matches(container)) {
+				return UnexecutableCommand.INSTANCE;
+			}
+
+			// this is really a message set. Should go for the kind
+			if (RTMessageKind.IN == MessageSetUtils.getMessageKind(container)) {
+				return super.getBeforeCreateCommand(request);
+			}
+		}
+
+		// should not be possible to create except RT interface
+		return UnexecutableCommand.INSTANCE;
+	}
+
+}
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolContainerEditHelperAdvice.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolContainerEditHelperAdvice.java
new file mode 100644
index 00000000000..41154146749
--- /dev/null
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolContainerEditHelperAdvice.java
@@ -0,0 +1,137 @@
+/*****************************************************************************
+ * 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
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.umlrt.custom.advice;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+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.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.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
+import org.eclipse.papyrus.umlrt.custom.IUMLRTElementTypes;
+import org.eclipse.papyrus.umlrt.custom.utils.MessageSetUtils;
+import org.eclipse.papyrus.umlrt.custom.utils.ProtocolContainerUtils;
+import org.eclipse.papyrus.umlrt.internals.Activator;
+import org.eclipse.uml2.uml.Collaboration;
+import org.eclipse.uml2.uml.Interface;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * The helper advice class used for UMLRealTime::ProtocolContainer.
+ */
+public class ProtocolContainerEditHelperAdvice extends AbstractEditHelperAdvice {
+
+/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean approveRequest(IEditCommandRequest request) {
+		if (request instanceof CreateElementRequest) {
+			CreateElementRequest createElementRequest = ((CreateElementRequest) request);
+			// retrieve element type from this request and check if this is a kind of UMLRT::Message
+			IElementType type = createElementRequest.getElementType();
+
+			// type should only be compatible with UMLRT::OperationAsMessages
+			IElementType umlRTMessageType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.RT_OPERATION_AS_MESSAGE);
+			// should not be null, otherwise, element type model is not loaded correctly. abort.
+			if (umlRTMessageType == null) {
+				Activator.log.debug("MessageAsOperation element type is not accessible");
+				return super.approveRequest(request);
+			}
+
+			// check type is compatible with UMLRT::OperationAsMessages. If yes, allow creation
+			List<IElementType> types = Arrays.asList(type.getAllSuperTypes());
+			if (types.contains(umlRTMessageType)) {
+				return true;
+			}
+			return super.approveRequest(request);
+		}
+		return super.approveRequest(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getAfterEditContextCommand(GetEditContextRequest request) {
+		IEditCommandRequest editCommandRequest = request.getEditCommandRequest();
+		if(editCommandRequest instanceof CreateElementRequest) {
+			// check the element to create is a sub kind of RTMessage
+			
+
+		}
+		
+		return super.getAfterEditContextCommand(request);
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getAfterSetCommand(SetRequest request) {
+		// for change name request, changes the name of the protocol and its interfaces
+		if (UMLPackage.eINSTANCE.getNamedElement_Name().equals(request.getFeature())) {
+
+			final EObject elementToEdit = request.getElementToEdit();
+			if (!(elementToEdit instanceof Package)) {
+				return super.getBeforeSetCommand(request);
+			}
+
+			final String newName = (request.getValue() != null) ? request.getValue().toString() : "Protocol";
+
+			final Package protocolContainer = (Package) elementToEdit;
+			RecordingCommand command = new RecordingCommand(request.getEditingDomain(), "Change Dependents", "Change the names of the dependents of the ProtocolContainer") {
+
+				@Override
+				protected void doExecute() {
+					// rename protocol, avoid dependency to avoid circular dependencies towards advices
+					Interface interfaceIn = ProtocolContainerUtils.getMessageSetIn(protocolContainer);
+					if (interfaceIn != null) {
+						interfaceIn.setName(MessageSetUtils.computeInterfaceInName(newName));
+					}
+
+					Interface interfaceOut = ProtocolContainerUtils.getMessageSetOut(protocolContainer);
+					if (interfaceOut != null) {
+						interfaceOut.setName(MessageSetUtils.computeInterfaceOutName(newName));
+					}
+
+					Interface interfaceInOut = ProtocolContainerUtils.getMessageSetInOut(protocolContainer);
+					if (interfaceInOut != null) {
+						interfaceInOut.setName(MessageSetUtils.computeInterfaceInOutName(newName));
+					}
+
+					Collaboration collaboration = ProtocolContainerUtils.getCollaboration(protocolContainer);
+					if (collaboration != null) {
+						collaboration.setName(newName);
+					}
+				}
+			};
+			// check the super in case of more commands
+			ICommand superCommand = super.getAfterSetCommand(request);
+			if (superCommand != null) {
+				return superCommand.compose(new EMFtoGMFCommandWrapper(command));
+			}
+			return new EMFtoGMFCommandWrapper(command);
+		}
+		return super.getAfterSetCommand(request);
+	}
+}
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolEditHelperAdvice.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolEditHelperAdvice.java
index c8b94daee54..0aca34e3e9a 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolEditHelperAdvice.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolEditHelperAdvice.java
@@ -24,6 +24,7 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
 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;
@@ -34,9 +35,14 @@ import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice
 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.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
 import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
 import org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageKind;
 import org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet;
+import org.eclipse.papyrus.umlrt.custom.utils.MessageSetUtils;
+import org.eclipse.papyrus.umlrt.custom.utils.ProtocolContainerUtils;
+import org.eclipse.papyrus.umlrt.custom.utils.ProtocolUtils;
 import org.eclipse.uml2.uml.Collaboration;
 import org.eclipse.uml2.uml.Interface;
 import org.eclipse.uml2.uml.InterfaceRealization;
@@ -44,6 +50,7 @@ import org.eclipse.uml2.uml.NamedElement;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.PackageableElement;
 import org.eclipse.uml2.uml.Type;
+import org.eclipse.uml2.uml.UMLPackage;
 import org.eclipse.uml2.uml.Usage;
 import org.eclipse.uml2.uml.util.UMLUtil;
 
@@ -61,6 +68,62 @@ public class ProtocolEditHelperAdvice extends AbstractEditHelperAdvice {
 	}
 
 	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getAfterSetCommand(SetRequest request) {
+		if(UMLPackage.eINSTANCE.getNamedElement_Name().equals(request.getFeature() ) ){
+
+			final EObject elementToEdit = request.getElementToEdit();
+			if (!(elementToEdit instanceof Collaboration)) {
+				return super.getAfterSetCommand(request);
+			}
+			final Collaboration protocol = (Collaboration) elementToEdit;
+			
+			final String newName = (request.getValue() != null) ? request.getValue().toString() : "Protocol";
+		
+			RecordingCommand command = new RecordingCommand(request.getEditingDomain(), "Change Dependents", "Change the names of the dependents of the Protocol") {
+
+				@Override
+				protected void doExecute() {
+					Package protocolContainer = ProtocolUtils.getPackageContainer(protocol);
+					if(protocolContainer ==null) {
+						return;
+					}
+					
+					protocolContainer.setName(newName);
+					
+					// rename protocol, avoid dependency to avoid circular dependencies towards advices
+					Interface interfaceIn = ProtocolContainerUtils.getMessageSetIn(protocolContainer);
+					if (interfaceIn != null) {
+						interfaceIn.setName(MessageSetUtils.computeInterfaceInName(newName));
+					}
+
+					Interface interfaceOut = ProtocolContainerUtils.getMessageSetOut(protocolContainer);
+					if (interfaceOut != null) {
+						interfaceOut.setName(MessageSetUtils.computeInterfaceOutName(newName));
+					}
+
+					Interface interfaceInOut = ProtocolContainerUtils.getMessageSetInOut(protocolContainer);
+					if (interfaceInOut != null) {
+						interfaceInOut.setName(MessageSetUtils.computeInterfaceInOutName(newName));
+					}
+
+				}
+			};
+			// check the super in case of more commands
+			ICommand superCommand = super.getAfterSetCommand(request);
+			if (superCommand != null) {
+				return superCommand.compose(new EMFtoGMFCommandWrapper(command));
+			}
+			return new EMFtoGMFCommandWrapper(command);
+		}
+		return super.getAfterSetCommand(request);
+	}
+
+
+
+	/**
 	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeConfigureCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest)
 	 *
 	 * @param request
@@ -69,7 +132,7 @@ public class ProtocolEditHelperAdvice extends AbstractEditHelperAdvice {
 	@Override
 	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
 		final Collaboration protocol = (Collaboration) request.getElementToConfigure();
-		final String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("EmptyProtocol", protocol.eContainer().eContents());
+		final String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("Protocol", protocol.eContainer().eContents());
 
 		return new ConfigureElementCommand(request) {
 			private IProgressMonitor progressMonitor;
@@ -84,13 +147,13 @@ public class ProtocolEditHelperAdvice extends AbstractEditHelperAdvice {
 				createElement(protocol, name, PROTOCOL_CONTAINER, Relation.PARENT); 
 
 				// Create the incoming UMLRealTime::RTMessageSet interface
-				String nameIn = name;
+				String nameIn = MessageSetUtils.computeInterfaceInName(name);
 				Interface rtMessageSetInt = (Interface) createElement(protocol, nameIn, RT_MESSAGE_SET, Relation.SIBLING); 
 				setRtMsgKind(rtMessageSetInt, RTMessageKind.IN);
 				createInterfaceRealization(protocol, nameIn, rtMessageSetInt);
 
 				// Create the outgoing UMLRealTime::RTMessageSet interface
-				String nameOut = name + "~";
+				String nameOut = MessageSetUtils.computeInterfaceOutName(name);
 				Interface rtMessageSetOutInt = (Interface) createElement(protocol, nameOut, RT_MESSAGE_SET, Relation.SIBLING); 
 				setRtMsgKind(rtMessageSetOutInt, RTMessageKind.OUT);
 				createUsage(protocol, nameOut, rtMessageSetOutInt);
@@ -98,7 +161,7 @@ public class ProtocolEditHelperAdvice extends AbstractEditHelperAdvice {
 				createElement(protocol, "*", ANY_RECEIVE_EVENT, Relation.SIBLING); //$NON-NLS-1$
 
 				// Create the in-out UMLRealTime::RTMessageSet interface
-				String nameInOut = name + "IO";
+				String nameInOut = MessageSetUtils.computeInterfaceInOutName(name);
 				Interface rtMessageSetInOutInt = (Interface) createElement(protocol, nameInOut, RT_MESSAGE_SET, Relation.SIBLING); 
 				setRtMsgKind(rtMessageSetInOutInt, RTMessageKind.IN_OUT);
 				createInterfaceRealization(protocol, nameInOut, rtMessageSetInOutInt);
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/matcher/UMLRTProfileDependentMatcher.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/matcher/UMLRTProfileDependentMatcher.java
new file mode 100644
index 00000000000..e51d9817b92
--- /dev/null
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/matcher/UMLRTProfileDependentMatcher.java
@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * 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.umlrt.custom.matcher;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Package;
+
+/**
+ * Matcher for advices that are dependent of a UML-RT profile
+ */
+public class UMLRTProfileDependentMatcher implements IElementMatcher {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean matches(EObject eObject) {
+		if((eObject instanceof Element)) {
+			return false;
+		}
+		Package package_ = ((Element)eObject).getNearestPackage();
+		if (package_ != null && package_.getAppliedProfile("UMLRealTime") != null) {
+			return true;
+		}
+		
+		return false;
+	}
+
+}
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/utils/MessageSetUtils.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/utils/MessageSetUtils.java
index d26c29203d1..ec8128c54f7 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/utils/MessageSetUtils.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/utils/MessageSetUtils.java
@@ -49,4 +49,20 @@ public class MessageSetUtils {
 		return null;
 	}
 
+	/**
+	 * @param newName
+	 * @return
+	 */
+	public static String computeInterfaceInName(String protocolName) {
+		return protocolName;
+	}
+
+	public static String computeInterfaceOutName(String protocolName) {
+		return protocolName + "~";
+	}
+
+	public static String computeInterfaceInOutName(String protocolName) {
+		return protocolName + "IO";
+	}
+
 }
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/utils/ProtocolContainerUtils.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/utils/ProtocolContainerUtils.java
index fa42d4de954..d91db4705df 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/utils/ProtocolContainerUtils.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/utils/ProtocolContainerUtils.java
@@ -19,6 +19,7 @@ import java.util.List;
 
 import org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageKind;
 import org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet;
+import org.eclipse.uml2.uml.Collaboration;
 import org.eclipse.uml2.uml.Interface;
 import org.eclipse.uml2.uml.Operation;
 import org.eclipse.uml2.uml.Package;
@@ -98,5 +99,13 @@ public class ProtocolContainerUtils {
 		return getMessageSet(protocolContainer, RTMessageKind.IN_OUT);
 	}
 
-
+	public static Collaboration getCollaboration(Package protocolContainer) {
+		for(PackageableElement packageableElement : protocolContainer.getPackagedElements()) {
+			// look each interface to find the right one with the stereotype message set
+			if(packageableElement instanceof Collaboration) {
+				return (Collaboration)packageableElement;
+			}
+		}
+		return null;
+	}
 }
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/utils/ProtocolUtils.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/utils/ProtocolUtils.java
new file mode 100644
index 00000000000..9607a9f60d8
--- /dev/null
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/utils/ProtocolUtils.java
@@ -0,0 +1,35 @@
+/*****************************************************************************
+ * 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.umlrt.custom.utils;
+
+import org.eclipse.uml2.uml.Collaboration;
+import org.eclipse.uml2.uml.Package;
+
+/**
+ * Utility class for UMLRT::Protocols
+ */
+public class ProtocolUtils {
+
+	/**
+	 * Returns the package that corresponds to the protocol container. There should be a check here for the applied stereotype on the package.
+	 * 
+	 * @param protocol
+	 *            the collaboration for which the protocol container is searched
+	 * @return the collaboration for which the protocol container is searched or <code>null</code> if none is found
+	 */
+	public static Package getPackageContainer(Collaboration protocol) {
+		return protocol.getNearestPackage();
+	}
+
+}
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/internals/Activator.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/internals/Activator.java
new file mode 100644
index 00000000000..c6e83bcdf8a
--- /dev/null
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/internals/Activator.java
@@ -0,0 +1,68 @@
+/*****************************************************************************
+ * 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.umlrt.internals;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.osgi.framework.BundleContext;
+
+/**
+ * Activator for this plugin
+ */
+public class Activator extends Plugin {
+
+	/** The plug-in ID */
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.umlrt";
+
+	/** share instance */
+	private static Activator plugin;
+
+	/** log helper for this plugin */
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		log = null;
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+}
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeEditPart.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeEditPart.xtend
index 602ad454205..587718b9291 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeEditPart.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeEditPart.xtend
@@ -397,7 +397,9 @@ def specificHandleNotificationEvent (GenNode it) '''
 			if(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {
 				Object notifier = event.getNotifier();
 				java.util.List<?> modelChildren = ((org.eclipse.gmf.runtime.notation.View)getModel()).getChildren();
-				if(!(notifier instanceof org.eclipse.gmf.runtime.notation.Edge)) {
+				if (false == notifier instanceof org.eclipse.gmf.runtime.notation.Edge
+					««« see Bug 463769
+					&& false == notifier instanceof org.eclipse.gmf.runtime.notation.BasicCompartment) {
 					if(modelChildren.contains(event.getNotifier())) {
 						return;
 					}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagram.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagram.java
index 9d1b5106384..43ba2fd0937 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagram.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagram.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

+ * Copyright (c) 2012, 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,6 +8,7 @@
  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *  Christian W. Damus - bug 464443

  *****************************************************************************/

 package org.eclipse.papyrus.infra.gmfdiag.css.notation;

 

@@ -15,6 +16,7 @@ import java.util.List;
 

 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

+import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;

 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;

 

 /**

@@ -23,7 +25,7 @@ import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;
  * @author Camille Letavernier

  *

  */

-public interface CSSDiagram extends Diagram {

+public interface CSSDiagram extends Diagram, CSSView {

 

 	/**

 	 * Returns the list of stylesheets directly owned by this diagram

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagramImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagramImpl.java
index c8243798369..4931c4b6855 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagramImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagramImpl.java
@@ -10,6 +10,7 @@
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *  Christian W. Damus (CEA) - support adapter instead of custom resource impl for CSS (CDO)
  *  Christian W. Damus - bug 433206
+ *  Christian W. Damus - bug 464443
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.css.notation;
@@ -17,13 +18,18 @@ package org.eclipse.papyrus.infra.gmfdiag.css.notation;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.gmf.runtime.notation.EObjectListValueStyle;
 import org.eclipse.gmf.runtime.notation.NamedStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.Style;
 import org.eclipse.gmf.runtime.notation.impl.DiagramImpl;
 import org.eclipse.papyrus.infra.gmfdiag.css.engine.DiagramCSSEngine;
 import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
 import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource;
+import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;
+import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSViewDelegate;
 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;
@@ -41,6 +47,8 @@ public class CSSDiagramImpl extends DiagramImpl implements CSSDiagram {
 
 	protected ExtendedCSSEngine engine;
 
+	private CSSView cssView;
+
 	@Override
 	public ExtendedCSSEngine getEngine() {
 		if (engine == null) {
@@ -124,4 +132,70 @@ public class CSSDiagramImpl extends DiagramImpl implements CSSDiagram {
 		return ref;
 	}
 
+	protected CSSView getCSSView() {
+		if (cssView == null) {
+			cssView = new CSSViewDelegate(this, getEngine());
+		}
+		return cssView;
+	}
+
+	// //////////////////////////////////
+	// Implements the isVisible method //
+	// //////////////////////////////////
+
+	@Override
+	public boolean isVisible() {
+		// return super.isVisible();
+		return isCSSVisible();
+	}
+
+	@Override
+	public boolean isCSSVisible() {
+		boolean value = super.isVisible();
+
+		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getView_Visible(), value)) {
+			return value;
+		} else {
+			return getCSSView().isCSSVisible();
+		}
+	}
+
+	// //////////////////////////////////////
+	// Implements the getNamedStyle method //
+	// //////////////////////////////////////
+
+	@Override
+	public NamedStyle getNamedStyle(EClass eClass, String name) {
+		return getCSSNamedStyle(eClass, name);
+	}
+
+	@Override
+	public NamedStyle getCSSNamedStyle(EClass eClass, String name) {
+		NamedStyle userStyle = super.getNamedStyle(eClass, name);
+		if (userStyle != null) {
+			return userStyle;
+		}
+
+		return getCSSView().getCSSNamedStyle(eClass, name);
+	}
+
+	// /////////////////////////////////
+	// Implements the getStyle method //
+	// /////////////////////////////////
+
+	@Override
+	public Style getStyle(EClass eClass) {
+		return getCSSStyle(eClass);
+	}
+
+	@Override
+	public Style getCSSStyle(EClass eClass) {
+		Style userStyle = super.getStyle(eClass);
+		if (userStyle != null) {
+			return userStyle;
+		}
+
+		return getCSSView().getCSSStyle(eClass);
+	}
+
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
index bf94e7479e0..f3a12619561 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
@@ -1,96 +1,97 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.common,

- org.eclipse.papyrus.infra.gmfdiag.common.adapter,

- org.eclipse.papyrus.infra.gmfdiag.common.advice,

- org.eclipse.papyrus.infra.gmfdiag.common.commands,

- org.eclipse.papyrus.infra.gmfdiag.common.commands.requests,

- org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom,

- org.eclipse.papyrus.infra.gmfdiag.common.decoration,

- org.eclipse.papyrus.infra.gmfdiag.common.editpart,

- org.eclipse.papyrus.infra.gmfdiag.common.editpolicies,

- org.eclipse.papyrus.infra.gmfdiag.common.expansion,

- org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel,

- org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.impl,

- org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.util,

- org.eclipse.papyrus.infra.gmfdiag.common.figure,

- org.eclipse.papyrus.infra.gmfdiag.common.figure.edge,

- org.eclipse.papyrus.infra.gmfdiag.common.figure.node,

- org.eclipse.papyrus.infra.gmfdiag.common.geometry,

- org.eclipse.papyrus.infra.gmfdiag.common.handler,

- org.eclipse.papyrus.infra.gmfdiag.common.helper,

- org.eclipse.papyrus.infra.gmfdiag.common.listener,

- org.eclipse.papyrus.infra.gmfdiag.common.locator,

- org.eclipse.papyrus.infra.gmfdiag.common.messages,

- org.eclipse.papyrus.infra.gmfdiag.common.model,

- org.eclipse.papyrus.infra.gmfdiag.common.preferences,

- org.eclipse.papyrus.infra.gmfdiag.common.providers,

- org.eclipse.papyrus.infra.gmfdiag.common.reconciler,

- org.eclipse.papyrus.infra.gmfdiag.common.selection,

- org.eclipse.papyrus.infra.gmfdiag.common.service.shape,

- org.eclipse.papyrus.infra.gmfdiag.common.snap,

- org.eclipse.papyrus.infra.gmfdiag.common.snap.copy,

- org.eclipse.papyrus.infra.gmfdiag.common.strategy,

- org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy,

- org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste,

- org.eclipse.papyrus.infra.gmfdiag.common.types,

- org.eclipse.papyrus.infra.gmfdiag.common.undocontext,

- org.eclipse.papyrus.infra.gmfdiag.common.utils

-Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="2.5.0",

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

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

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.gef;bundle-version="3.7.1";visibility:=reexport,

- org.eclipse.emf.workspace;bundle-version="1.4.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

- org.eclipse.core.databinding;bundle-version="1.4.1",

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

- org.eclipse.papyrus.infra.gmfdiag.commands;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",

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

- 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.services.edit;bundle-version="1.1.0",

- com.google.guava;bundle-version="11.0.0",

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

- org.eclipse.emf.databinding;bundle-version="1.3.0",

- org.eclipse.core.databinding.property;bundle-version="1.4.200",

- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.1",

- org.eclipse.core.expressions,

- org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

- org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",

- org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)",

- org.w3c.dom.svg;bundle-version="1.1.0",

- org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",

- org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",

- org.apache.batik.xml;bundle-version="[1.6.0,1.7.0)",

- org.eclipse.gmf.tooling.runtime,

- com.ibm.icu,

- 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.papyrus.infra.services.decoration;bundle-version="1.1.0",

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

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.1.0",

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

- org.eclipse.gmf.runtime.draw2d.ui.render.awt,

- org.apache.xerces;bundle-version="2.9.0",

- org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.papyrus.uml.extensionpoints

-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.infra.gmfdiag.common.Activator

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.common,
+ org.eclipse.papyrus.infra.gmfdiag.common.adapter,
+ org.eclipse.papyrus.infra.gmfdiag.common.advice,
+ org.eclipse.papyrus.infra.gmfdiag.common.commands,
+ org.eclipse.papyrus.infra.gmfdiag.common.commands.requests,
+ org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom,
+ org.eclipse.papyrus.infra.gmfdiag.common.decoration,
+ org.eclipse.papyrus.infra.gmfdiag.common.editpart,
+ org.eclipse.papyrus.infra.gmfdiag.common.editpolicies,
+ org.eclipse.papyrus.infra.gmfdiag.common.expansion,
+ org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel,
+ org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.impl,
+ org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.util,
+ org.eclipse.papyrus.infra.gmfdiag.common.figure,
+ org.eclipse.papyrus.infra.gmfdiag.common.figure.edge,
+ org.eclipse.papyrus.infra.gmfdiag.common.figure.node,
+ org.eclipse.papyrus.infra.gmfdiag.common.geometry,
+ org.eclipse.papyrus.infra.gmfdiag.common.handler,
+ org.eclipse.papyrus.infra.gmfdiag.common.helper,
+ org.eclipse.papyrus.infra.gmfdiag.common.listener,
+ org.eclipse.papyrus.infra.gmfdiag.common.locator,
+ org.eclipse.papyrus.infra.gmfdiag.common.messages,
+ org.eclipse.papyrus.infra.gmfdiag.common.model,
+ org.eclipse.papyrus.infra.gmfdiag.common.parsers,
+ org.eclipse.papyrus.infra.gmfdiag.common.preferences,
+ org.eclipse.papyrus.infra.gmfdiag.common.providers,
+ org.eclipse.papyrus.infra.gmfdiag.common.reconciler,
+ org.eclipse.papyrus.infra.gmfdiag.common.selection,
+ org.eclipse.papyrus.infra.gmfdiag.common.service.shape,
+ org.eclipse.papyrus.infra.gmfdiag.common.snap,
+ org.eclipse.papyrus.infra.gmfdiag.common.snap.copy,
+ org.eclipse.papyrus.infra.gmfdiag.common.strategy,
+ org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy,
+ org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste,
+ org.eclipse.papyrus.infra.gmfdiag.common.types,
+ org.eclipse.papyrus.infra.gmfdiag.common.undocontext,
+ org.eclipse.papyrus.infra.gmfdiag.common.utils
+Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="2.5.0",
+ org.eclipse.emf.ecore.edit;bundle-version="2.5.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0";visibility:=reexport,
+ org.eclipse.gef;bundle-version="3.7.1";visibility:=reexport,
+ org.eclipse.emf.workspace;bundle-version="1.4.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",
+ org.eclipse.core.databinding;bundle-version="1.4.1",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;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",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ 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.services.edit;bundle-version="1.1.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
+ org.eclipse.emf.databinding;bundle-version="1.3.0",
+ org.eclipse.core.databinding.property;bundle-version="1.4.200",
+ org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.1",
+ org.eclipse.core.expressions,
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)",
+ org.w3c.dom.svg;bundle-version="1.1.0",
+ org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.xml;bundle-version="[1.6.0,1.7.0)",
+ org.eclipse.gmf.tooling.runtime,
+ com.ibm.icu,
+ 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.papyrus.infra.services.decoration;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.draw2d.ui.render.awt,
+ org.apache.xerces;bundle-version="2.9.0",
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0"
+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.infra.gmfdiag.common.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/parsers/AbstractElementTypeBasedAttributeParser.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/parsers/AbstractElementTypeBasedAttributeParser.java
new file mode 100644
index 00000000000..77625b60370
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/parsers/AbstractElementTypeBasedAttributeParser.java
@@ -0,0 +1,61 @@
+/*****************************************************************************
+ * 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.gmfdiag.common.parsers;
+
+import org.eclipse.emf.ecore.EAttribute;
+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.common.core.command.UnexecutableCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.gmf.tooling.runtime.parsers.AbstractAttributeParser;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+
+/**
+ * Attribute parser that uses the service edit to modify the attribute rather than directly create the command from a SetRequest
+ */
+public abstract class AbstractElementTypeBasedAttributeParser extends AbstractAttributeParser {
+
+	public AbstractElementTypeBasedAttributeParser(EAttribute[] features) {
+		super(features);
+	}
+
+	public AbstractElementTypeBasedAttributeParser(EAttribute[] features, EAttribute[] editableFeatures) {
+		super(features, editableFeatures);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getModificationCommand(EObject element, EStructuralFeature feature, Object value) {
+		value = getValidNewValue(feature, value);
+		if (value instanceof InvalidValue) {
+			return UnexecutableCommand.INSTANCE;
+		}
+		SetRequest request = new SetRequest(element, feature, value);
+
+		// use service edit here
+		IElementEditService service = ElementEditServiceUtils.getCommandProvider(element);
+		if (service != null) {
+			return service.getEditCommand(request);
+		}
+
+		// no service edit => return standard command
+		return new SetValueCommand(request);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/src/org/eclipse/papyrus/infra/gmfdiag/controlmode/ControlDiagramsCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/src/org/eclipse/papyrus/infra/gmfdiag/controlmode/ControlDiagramsCommand.java
index 4b6df520263..20f4972464f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/src/org/eclipse/papyrus/infra/gmfdiag/controlmode/ControlDiagramsCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/src/org/eclipse/papyrus/infra/gmfdiag/controlmode/ControlDiagramsCommand.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013 Atos.
+ * Copyright (c) 2013, 2015 Atos, 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
@@ -7,25 +7,31 @@
  *
  * Contributors:
  *     Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation
+ *     Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 459427
  ******************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.controlmode;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.infra.gmfdiag.controlmode.messages.Messages;
 import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
 import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequestParameters;
 import org.eclipse.papyrus.infra.services.controlmode.commands.AbstractControlCommand;
@@ -38,13 +44,30 @@ import org.eclipse.papyrus.infra.services.controlmode.commands.AbstractControlCo
  */
 public class ControlDiagramsCommand extends AbstractControlCommand {
 
+	/** The Constant RETRIEVE_OLD_URI_RESOURCE_ERROR. */
+	private static final String RETRIEVE_OLD_URI_RESOURCE_ERROR = Messages.getString("ControlDiagramsCommand.old.uri.resource.error"); //$NON-NLS-1$
+
+	/** The Constant RETRIEVE_OLD_RESOURCE_ERROR. */
+	private static final String RETRIEVE_OLD_RESOURCE_ERROR = Messages.getString("ControlDiagramsCommand.old.resource.error"); //$NON-NLS-1$
+
+	/** The Constant COMMAND_TITLE. */
+	private static final String COMMAND_TITLE = Messages.getString("ControlDiagramsCommand.command.title"); //$NON-NLS-1$
+
+	/** The Constant CREATION_RESOURCE_ERROR. */
+	private static final String CREATION_RESOURCE_ERROR = Messages.getString("ControlDiagramsCommand.resource.creation.error"); //$NON-NLS-1$
+
+	/** The old notation resource. */
+	private Resource oldNotationResource = null;
 
 	/**
+	 * Instantiates a new control diagrams command.
+	 *
 	 * @param request
+	 *            the request
 	 */
 	@SuppressWarnings("unchecked")
 	public ControlDiagramsCommand(ControlModeRequest request) {
-		super("Move diagram to new resource", null, request);
+		super(COMMAND_TITLE, null, request);
 		getAffectedFiles().addAll(getWorkspaceFiles(getDiagrams()));
 
 	}
@@ -58,7 +81,7 @@ public class ControlDiagramsCommand extends AbstractControlCommand {
 	@SuppressWarnings("unchecked")
 	protected void addMovedDiagramToRequest(List<Diagram> diags) {
 		Collection<EObject> openables = (Collection<EObject>) getRequest().getParameter(ControlModeRequestParameters.MOVED_OPENABLES);
-		if (openables == null) {
+		if (null == openables) {
 			openables = new ArrayList<EObject>();
 		}
 		openables.addAll(diags);
@@ -67,18 +90,49 @@ public class ControlDiagramsCommand extends AbstractControlCommand {
 
 	@Override
 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) {
-		EObject objectTOControl = getRequest().getTargetObject();
-		EMFHelper.getUsages(objectTOControl);
+
+		EObject objectToControl = getRequest().getTargetObject();
+
 		// Retrieve new notation resource created previously
 		Resource newNotationResource = getRequest().getTargetResource(NotationModel.NOTATION_FILE_EXTENSION);
-		if (newNotationResource == null) {
-			return CommandResult.newErrorCommandResult("The notation model has not been created");
+		if (null == newNotationResource) {
+			return CommandResult.newErrorCommandResult(CREATION_RESOURCE_ERROR);
 		}
+
+		// Move contained diagrams to new resource
 		List<Diagram> diagrams = getDiagrams();
 		if (!diagrams.isEmpty()) {
 			newNotationResource.getContents().addAll(diagrams);
 			addMovedDiagramToRequest(diagrams);
 		}
+
+		// Update notation resources references
+		Collection<Setting> crossReferences = EMFHelper.getUsages(objectToControl);
+
+		Set<Resource> impactedNotationResources = new HashSet<Resource>(2);
+		if (!crossReferences.isEmpty()) {
+
+			// Look for impacted notation resources
+			for (Setting setting : crossReferences) {
+				EObject referencedObject = setting.getEObject();
+				if (referencedObject instanceof View) {
+					Resource resource = referencedObject.eResource();
+					if (null != resource) {
+						impactedNotationResources.add(resource);
+					}
+				}
+
+			}
+
+			if (!impactedNotationResources.isEmpty()) {
+				// Update resources that have references
+				for (Resource resource : impactedNotationResources) {
+					resource.setModified(true);
+				}
+			}
+
+		}
+
 		return CommandResult.newOKCommandResult(newNotationResource);
 	}
 
@@ -88,16 +142,30 @@ public class ControlDiagramsCommand extends AbstractControlCommand {
 	 * @return the diagrams
 	 */
 	protected List<Diagram> getDiagrams() {
-		Resource notationResource = null;
-		try {
-			notationResource = getRequest().getModelSet().getResource(getOldNotationURI(), true);
-		} catch (Exception e) {
-			Activator.log.error("Unable to retrieve old notation resource", e);
-		}
+		Resource notationResource = getOldNotationResource();
 
 		return NotationUtils.getDiagrams(notationResource, getRequest().getTargetObject());
 	}
 
+
+	/**
+	 * Gets the old notation resource.
+	 *
+	 * @return the old notation resource
+	 */
+	private Resource getOldNotationResource() {
+
+		if (null == oldNotationResource) {
+			try {
+				oldNotationResource = getRequest().getModelSet().getResource(getOldNotationURI(), true);
+			} catch (Exception e) {
+				Activator.log.error(RETRIEVE_OLD_RESOURCE_ERROR, e);
+			}
+		}
+
+		return oldNotationResource;
+	}
+
 	/**
 	 * Get the old notation URI for request
 	 *
@@ -106,9 +174,9 @@ public class ControlDiagramsCommand extends AbstractControlCommand {
 	 */
 	protected URI getOldNotationURI() throws ExecutionException {
 		URI uri = getRequest().getSourceURI();
-		if (uri != null) {
+		if (null != uri) {
 			return uri.trimFileExtension().appendFileExtension(NotationModel.NOTATION_FILE_EXTENSION);
 		}
-		throw new ExecutionException("Unable to retreive URI of the old notation model");
+		throw new ExecutionException(RETRIEVE_OLD_URI_RESOURCE_ERROR);
 	}
 }
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/src/org/eclipse/papyrus/infra/gmfdiag/controlmode/GMFDiagramControlParticipant.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/src/org/eclipse/papyrus/infra/gmfdiag/controlmode/GMFDiagramControlParticipant.java
index a3a8ed21276..f4b237ee82b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/src/org/eclipse/papyrus/infra/gmfdiag/controlmode/GMFDiagramControlParticipant.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/src/org/eclipse/papyrus/infra/gmfdiag/controlmode/GMFDiagramControlParticipant.java
@@ -1,96 +1,99 @@
-/*******************************************************************************

- * Copyright (c) 2013 Atos.

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *     Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.controlmode;

-

-

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

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

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

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;

-import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;

-import org.eclipse.papyrus.infra.services.controlmode.commands.CreateControlResource;

-import org.eclipse.papyrus.infra.services.controlmode.commands.RemoveControlResourceCommand;

-import org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant;

-import org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant;

-

-/**

- * Particiant that will and diagram control

- *

- * @author adaussy

- *

- */

-public class GMFDiagramControlParticipant implements IControlCommandParticipant, IUncontrolCommandParticipant {

-

-	/**

-	 * Init target request to have the DIModel resource references

-	 *

-	 * @param request

-	 */

-	protected boolean setNotationTargetRequest(ControlModeRequest request) {

-		URI notationURI = request.getNewURI().trimFileExtension().appendFileExtension(NotationModel.NOTATION_FILE_EXTENSION);

-		ModelSet modelSet = request.getModelSet();

-		if (modelSet != null) {

-			Resource notationResource = null;

-			try {

-				notationResource = modelSet.getResource(notationURI, true);

-			} catch (Exception e) {

-				notationResource = null;

-			}

-			if (notationResource == null) {

-				return false;

-			}

-			request.setTargetResource(notationResource, NotationModel.NOTATION_FILE_EXTENSION);

-			// Nothing to do but everything is ok

-			return true;

-		}

-		return false;

-	}

-

-	public String getID() {

-		return "org.eclipse.papyrus.infra.gmfdiag.controlmode.GMFDiagramControlParticipant";//

-	}

-

-	public ICommand getPostControlCommand(ControlModeRequest request) {

-		return new ControlDiagramsCommand(request);

-	}

-

-	public ICommand getPostUncontrolCommand(ControlModeRequest request) {

-		return new RemoveControlResourceCommand(request, NotationModel.NOTATION_FILE_EXTENSION);

-	}

-

-	public ICommand getPreControlCommand(ControlModeRequest request) {

-		// Create notation resource

-		return new CreateControlResource(request, NotationModel.NOTATION_FILE_EXTENSION);

-	}

-

-	public ICommand getPreUncontrolCommand(ControlModeRequest request) {

-		boolean result = setNotationTargetRequest(request);

-		if (result) {

-			return new ControlDiagramsCommand(request);

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	public int getPriority() {

-		return 60;

-	}

-

-	public boolean provideControlCommand(ControlModeRequest request) {

-		return request.getTargetObject() instanceof EObject;

-	}

-

-	public boolean provideUnControlCommand(ControlModeRequest request) {

-		return request.getTargetObject() instanceof EObject;

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2013 Atos.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.controlmode;
+
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
+import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
+import org.eclipse.papyrus.infra.services.controlmode.commands.CreateControlResource;
+import org.eclipse.papyrus.infra.services.controlmode.commands.RemoveControlResourceCommand;
+import org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant;
+import org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant;
+
+/**
+ * Particiant that will and diagram control
+ *
+ * @author adaussy
+ *
+ */
+public class GMFDiagramControlParticipant implements IControlCommandParticipant, IUncontrolCommandParticipant {
+
+	/** The Constant PARTICIPANT_ID. */
+	private static final String PARTICIPANT_ID = "org.eclipse.papyrus.infra.gmfdiag.controlmode.GMFDiagramControlParticipant"; //$NON-NLS-1$
+
+	/**
+	 * Init target request to have the DIModel resource references
+	 *
+	 * @param request
+	 */
+	protected boolean setNotationTargetRequest(ControlModeRequest request) {
+		URI notationURI = request.getNewURI().trimFileExtension().appendFileExtension(NotationModel.NOTATION_FILE_EXTENSION);
+		ModelSet modelSet = request.getModelSet();
+		if (modelSet != null) {
+			Resource notationResource = null;
+			try {
+				notationResource = modelSet.getResource(notationURI, true);
+			} catch (Exception e) {
+				notationResource = null;
+			}
+			if (notationResource == null) {
+				return false;
+			}
+			request.setTargetResource(notationResource, NotationModel.NOTATION_FILE_EXTENSION);
+			// Nothing to do but everything is ok
+			return true;
+		}
+		return false;
+	}
+
+	public String getID() {
+		return PARTICIPANT_ID;
+	}
+
+	public ICommand getPostControlCommand(ControlModeRequest request) {
+		return new ControlDiagramsCommand(request);
+	}
+
+	public ICommand getPostUncontrolCommand(ControlModeRequest request) {
+		return new RemoveControlResourceCommand(request, NotationModel.NOTATION_FILE_EXTENSION);
+	}
+
+	public ICommand getPreControlCommand(ControlModeRequest request) {
+		// Create notation resource
+		return new CreateControlResource(request, NotationModel.NOTATION_FILE_EXTENSION);
+	}
+
+	public ICommand getPreUncontrolCommand(ControlModeRequest request) {
+		boolean result = setNotationTargetRequest(request);
+		if (result) {
+			return new ControlDiagramsCommand(request);
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	public int getPriority() {
+		return 60;
+	}
+
+	public boolean provideControlCommand(ControlModeRequest request) {
+		return request.getTargetObject() instanceof EObject;
+	}
+
+	public boolean provideUnControlCommand(ControlModeRequest request) {
+		return request.getTargetObject() instanceof EObject;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/src/org/eclipse/papyrus/infra/gmfdiag/controlmode/messages/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/src/org/eclipse/papyrus/infra/gmfdiag/controlmode/messages/Messages.java
new file mode 100644
index 00000000000..a2166109be5
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/src/org/eclipse/papyrus/infra/gmfdiag/controlmode/messages/Messages.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.gmfdiag.controlmode.messages;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * Class for externalisation of String.
+ * 
+ * @author Gabriel Pascual
+ *
+ */
+public class Messages {
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.controlmode.messages.messages"; //$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private Messages() {
+	}
+
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/src/org/eclipse/papyrus/infra/gmfdiag/controlmode/messages/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/src/org/eclipse/papyrus/infra/gmfdiag/controlmode/messages/messages.properties
new file mode 100644
index 00000000000..cf76dad3d3b
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/src/org/eclipse/papyrus/infra/gmfdiag/controlmode/messages/messages.properties
@@ -0,0 +1,4 @@
+ControlDiagramsCommand.command.title=Move diagram to new resource
+ControlDiagramsCommand.old.resource.error=Unable to retrieve old notation resource
+ControlDiagramsCommand.old.uri.resource.error=Unable to retreive URI of the old notation model
+ControlDiagramsCommand.resource.creation.error=The notation model has not been created
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF
index 6b309a0e10a..f7d639718e6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.core.databinding;bundle-version="1.4.1",

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

- org.eclipse.papyrus.infra.viewpoints.policy

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

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.1.0.qualifier

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
index 401b77abb09..0f87b1effa2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
@@ -64,7 +64,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",
  org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",
  org.eclipse.core.databinding.observable,
- org.eclipse.papyrus.uml.diagram.clazz
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.1.0.qualifier
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPortLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPortLabelParser.java
index 760506b23cb..4fef645ef06 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPortLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPortLabelParser.java
@@ -26,6 +26,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
+import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLMultiplicityElementUtil;
 import org.eclipse.papyrus.sysml.portandflows.FlowDirection;
 import org.eclipse.papyrus.sysml.portandflows.FlowPort;
 import org.eclipse.papyrus.sysml.portandflows.FlowSpecification;
@@ -152,17 +153,10 @@ public class FlowPortLabelParser extends PropertyLabelParser {
 			// manage multiplicity
 			if ((maskValues.contains(ICustomAppearance.DISP_MULTIPLICITY))) {
 
-				// If multiplicity is [1] (SysML default), only show when explicitly asked.
 				// TODO : add a case for default with multiplicity not set.
-				String lower = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getLowerValue()) : "1";
-				String upper = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getUpperValue()) : "1";
-				if ((maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY)) || !("1".equals(lower) && "1".equals(upper))) {
-
-					if (lower.equals(upper)) {
-						result = String.format(MULTIPLICITY_FORMAT_ALT, result, lower, upper);
-					} else {
-						result = String.format(MULTIPLICITY_FORMAT, result, lower, upper);
-					}
+				String multiplicity = SysMLMultiplicityElementUtil.formatMultiplicity(property, maskValues);
+				if (multiplicity != null && !multiplicity.isEmpty()) {
+					result += " " + multiplicity;
 				}
 			}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/AssociationEndLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/AssociationEndLabelParser.java
index bf9df2b19b0..ac2699f927b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/AssociationEndLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/AssociationEndLabelParser.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
+import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLMultiplicityElementUtil;
 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
 import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;
 import org.eclipse.uml2.uml.Association;
@@ -114,16 +115,9 @@ public class AssociationEndLabelParser extends PropertyLabelParser {
 			// manage multiplicity
 			if (maskValues.contains(ICustomAppearance.DISP_MULTIPLICITY)) {
 
-				// If multiplicity is [1] (SysML default), only show when explicitly asked.
-				String lower = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getLowerValue()) : "1";
-				String upper = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getUpperValue()) : "1";
-				if (maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) || !("1".equals(lower) && "1".equals(upper))) {
-
-					if (lower.equals(upper)) {
-						result = String.format(MULTIPLICITY_FORMAT_ALT, result, lower, upper);
-					} else {
-						result = String.format(MULTIPLICITY_FORMAT, result, lower, upper);
-					}
+				String multiplicity = SysMLMultiplicityElementUtil.formatMultiplicity(property, maskValues);
+				if (multiplicity != null && !multiplicity.isEmpty()) {
+					result += " " + multiplicity;
 				}
 			}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/MultiplicityElementLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/MultiplicityElementLabelParser.java
index a19b9fb7d3e..8dc1f4f4622 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/MultiplicityElementLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/MultiplicityElementLabelParser.java
@@ -35,8 +35,8 @@ import org.eclipse.papyrus.gmf.diagram.common.parser.IMaskManagedSemanticParser;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.helper.MaskLabelHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
+import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLMultiplicityElementUtil;
 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;
 import org.eclipse.uml2.uml.MultiplicityElement;
 import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.UMLPackage;
@@ -98,17 +98,10 @@ public class MultiplicityElementLabelParser implements IMaskManagedSemanticParse
 			// manage multiplicity
 			if ((maskValues.contains(ICustomAppearance.DISP_MULTIPLICITY))) {
 
-				// If multiplicity is [1] (SysML default), only show when explicitly asked.
 				// TODO : add a case for default with multiplicity not set.
-				String lower = (multElt.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(multElt.getLowerValue()) : "1";
-				String upper = (multElt.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(multElt.getUpperValue()) : "1";
-				if (maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) || !("1".equals(lower) && "1".equals(upper))) {
-
-					if (lower.equals(upper)) {
-						result = String.format(MULTIPLICITY_FORMAT_ALT, lower, upper);
-					} else {
-						result = String.format(MULTIPLICITY_FORMAT, lower, upper);
-					}
+				String multiplicity = SysMLMultiplicityElementUtil.formatMultiplicity(multElt, maskValues);
+				if (multiplicity != null && !multiplicity.isEmpty()) {
+					result += " " + multiplicity;
 				}
 			}
 		}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/PropertyLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/PropertyLabelParser.java
index b768fafb9f9..0fd37969d94 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/PropertyLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/PropertyLabelParser.java
@@ -27,6 +27,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
+import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLMultiplicityElementUtil;
 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
 import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;
 import org.eclipse.uml2.uml.Property;
@@ -132,17 +133,10 @@ public class PropertyLabelParser extends NamedElementLabelParser {
 			// manage multiplicity
 			if (maskValues.contains(ICustomAppearance.DISP_MULTIPLICITY)) {
 
-				// If multiplicity is [1] (SysML default), only show when explicitly asked.
 				// TODO : add a case for default with multiplicity not set.
-				String lower = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getLowerValue()) : "1";
-				String upper = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getUpperValue()) : "1";
-				if (maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) || !("1".equals(lower) && "1".equals(upper))) {
-
-					if (lower.equals(upper)) {
-						result = String.format(MULTIPLICITY_FORMAT_ALT, result, lower, upper);
-					} else {
-						result = String.format(MULTIPLICITY_FORMAT, result, lower, upper);
-					}
+				String multiplicity = SysMLMultiplicityElementUtil.formatMultiplicity(property, maskValues);
+				if (multiplicity != null && !multiplicity.isEmpty()) {
+					result += " " + multiplicity;
 				}
 			}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/ParameterLabelUtil.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/ParameterLabelUtil.java
index 36e044f392a..cc5a4f6776a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/ParameterLabelUtil.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/ParameterLabelUtil.java
@@ -17,6 +17,7 @@ import java.util.Collection;
 

 import org.eclipse.papyrus.gmf.diagram.common.parser.IMaskManagedSemanticParser;

 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;

+import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLMultiplicityElementUtil;

 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;

 import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;

 import org.eclipse.uml2.uml.Parameter;

@@ -96,10 +97,9 @@ public class ParameterLabelUtil {
 			}

 

 			// manage multiplicity

-			String lower = (parameter.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(parameter.getLowerValue()) : "1";

-			String upper = (parameter.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(parameter.getUpperValue()) : "1";

-			if ((displayValue.contains(ICustomAppearance.DISP_PARAMETER_MULTIPLICITY) || displayValue.contains(ICustomAppearance.DISP_MULTIPLICITY)) && !("1".equals(lower) && "1".equals(upper))) {

-				result = String.format(MULTIPLICITY_FORMAT, result, lower, upper);

+			String multiplicity = SysMLMultiplicityElementUtil.formatMultiplicity(parameter, displayValue);

+			if (multiplicity != null && !multiplicity.isEmpty()) {

+				result += " " + multiplicity;

 			}

 

 			// manage default value

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLMultiplicityElementUtil.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLMultiplicityElementUtil.java
new file mode 100644
index 00000000000..9df93007fbe
--- /dev/null
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLMultiplicityElementUtil.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.diagram.common.utils;

+

+import java.util.Collection;

+

+import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;

+import org.eclipse.uml2.uml.MultiplicityElement;

+

+

+public class SysMLMultiplicityElementUtil extends org.eclipse.papyrus.uml.tools.utils.MultiplicityElementUtil {

+

+	private static final String DEFAULT_MULTIPLICITY = "[1]";

+

+	/**

+	 * If multiplicity is [1] (SysML default), only show when explicitly asked.

+	 */

+	public static String formatMultiplicity(MultiplicityElement element, Collection<String> maskValues) {

+		return formatMultiplicity(element, !maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY));

+	}

+

+	public static String formatMultiplicity(MultiplicityElement element, boolean blockDefault) {

+		String result = formatMultiplicity(element);

+		if (result == null || result.isEmpty()) {

+			result = DEFAULT_MULTIPLICITY;

+		}

+		if (blockDefault && DEFAULT_MULTIPLICITY.equals(result)) {

+			result = "";

+		}

+		return result;

+	}

+}

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
index f4190a8e127..3067cc6e2c1 100644
--- 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
@@ -65,7 +65,7 @@ public class PinLabelHelper extends StereotypedElementLabelHelper {
 		StringBuffer buffer = new StringBuffer();
 		if (maskValues.contains(ICustomAppearance.DISP_NAME)) {
 			buffer.append(" ");
-			buffer.append(namedElement.getName());
+			buffer.append(namedElement.getName()== null ? "" : namedElement.getName());
 		}
 		if (namedElement instanceof TypedElement) {
 			if (maskValues.contains(ICustomAppearance.DISP_TYPE)) {
@@ -76,7 +76,7 @@ public class PinLabelHelper extends StereotypedElementLabelHelper {
 				}
 			}
 		}
-		return buffer.toString();
+		return buffer.toString().trim();
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/messages.properties
index fea1c957534..a5c93006410 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/messages.properties
@@ -93,8 +93,6 @@ CentralBufferNode18CreationTool_title=Central Buffer Node
 CentralBufferNode18CreationTool_desc=Create a Central Buffer Node
 DataStoreNode19CreationTool_title=Data Store Node
 DataStoreNode19CreationTool_desc=Create a Data Store Node
-Comment20CreationTool_title=Comment
-Comment20CreationTool_desc=Create a Comment
 ControlFlow1CreationTool_title=Control Flow
 ControlFlow1CreationTool_desc=Create a Control Flow
 ExceptionHandler2CreationTool_title=Exception Handler
@@ -233,3 +231,7 @@ NavigatorActionProvider_OpenDiagramActionName=Open Diagram
 MessageFormatParser_InvalidInputError=Invalid input at {0}
 UMLModelingAssistantProviderTitle=Select domain model element
 UMLModelingAssistantProviderMessage=Available domain model elements:
+Constraint20CreationTool_title=Constraint
+Constraint20CreationTool_desc=Create a Constraint
+Comment21CreationTool_title=Comment
+Comment21CreationTool_desc=Create a Comment
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 6e8730fffe5..1bd4274d560 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
@@ -6251,9 +6251,9 @@
               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"/>
+              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>
@@ -19307,6 +19307,14 @@
               genNodes="/0/@diagram/@childNodes.36"/>
           <entries
               xsi:type="gmfgen:ToolEntry"
+              title="Constraint"
+              description="Create a 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"
+              id="&quot;activity.nodes.constraint&quot;"
+              genNodes="/0/@diagram/@childNodes.114"/>
+          <entries
+              xsi:type="gmfgen:ToolEntry"
               title="Comment"
               description="Create a Comment"
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
index 04a3176a09e..bf468d79e2e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
@@ -1569,6 +1569,16 @@ self.structuralFeature.oclAsType(Property).opposite.type = self.object.type]]>
 					</entry>
 				<entry
 				      defineOnly="true"
+				      description="Create a Constraint"
+				      id="activity.nodes.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 Comment"
 				      id="activity.nodes.comment"
 				      kind="tool"
@@ -2450,6 +2460,10 @@ self.structuralFeature.oclAsType(Property).opposite.type = self.object.type]]>
 				path="/activity.nodes">
 		  </predefinedEntry>
 		<predefinedEntry
+		        id="activity.nodes.constraint"
+				path="/activity.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
 		        id="activity.nodes.comment"
 				path="/activity.nodes">
 		  </predefinedEntry>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/part/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/part/Messages.java
index 391c6386f8c..082525581ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/part/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/part/Messages.java
@@ -456,12 +456,22 @@ public class Messages extends NLS {
 	/**
 	 * @generated
 	 */
-	public static String Comment20CreationTool_title;
+	public static String Constraint20CreationTool_title;
 
 	/**
 	 * @generated
 	 */
-	public static String Comment20CreationTool_desc;
+	public static String Constraint20CreationTool_desc;
+
+	/**
+	 * @generated
+	 */
+	public static String Comment21CreationTool_title;
+
+	/**
+	 * @generated
+	 */
+	public static String Comment21CreationTool_desc;
 
 	/**
 	 * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/part/UMLPaletteFactory.java
index a1e0b90dcaf..a2da1281af9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/part/UMLPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/part/UMLPaletteFactory.java
@@ -64,6 +64,11 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	/**
 	 * @generated
 	 */
+	private final static String ACTIVITY_NODES_CONSTRAINT = "activity.nodes.constraint";//$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
 	private final static String ACTIVITY_NODES_COMMENT = "activity.nodes.comment";//$NON-NLS-1$
 
 	/**
@@ -389,8 +394,11 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 		if (toolId.equals(ACTIVITY_NODES_DATASTORENODE)) {
 			return createDataStoreNode19CreationTool();
 		}
+		if (toolId.equals(ACTIVITY_NODES_CONSTRAINT)) {
+			return createConstraint20CreationTool();
+		}
 		if (toolId.equals(ACTIVITY_NODES_COMMENT)) {
-			return createComment20CreationTool();
+			return createComment21CreationTool();
 		}
 		if (toolId.equals(ACTIVITY_EDGES_CONTROLFLOW)) {
 			return createControlFlow1CreationTool();
@@ -645,7 +653,17 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	/**
 	 * @generated
 	 */
-	private Tool createComment20CreationTool() {
+	private Tool createConstraint20CreationTool() {
+		List<IElementType> types = new ArrayList<IElementType>(1);
+		types.add(UMLElementTypes.Constraint_3112);
+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
+		return tool;
+	}
+
+	/**
+	 * @generated
+	 */
+	private Tool createComment21CreationTool() {
 		List<IElementType> types = new ArrayList<IElementType>(1);
 		types.add(UMLElementTypes.Comment_3080);
 		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java
index 517aba28889..d60c27df54b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java
@@ -35,6 +35,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -163,7 +164,8 @@ public class AssociationClassEditPart extends ClassifierEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java
index 1b7ca0f6d99..25a557ec955 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -146,7 +147,8 @@ public class AssociationNodeEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java
index 1483f4290fa..da96e1553dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java
@@ -38,6 +38,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -175,7 +176,8 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java
index 3a280905d9b..6755466103b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java
@@ -38,6 +38,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -178,7 +179,8 @@ public class ClassEditPartCN extends ClassEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java
index 98e1c0e729b..7d97ae6db8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java
@@ -37,6 +37,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -175,7 +176,8 @@ public class ComponentEditPart extends ClassifierEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java
index 4ca279fc23d..8648111af8f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java
@@ -37,6 +37,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -177,7 +178,8 @@ public class ComponentEditPartCN extends ClassifierEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java
index 88bc53df7fc..c869299913f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java
@@ -37,6 +37,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -175,7 +176,8 @@ public class DataTypeEditPart extends ClassifierEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java
index 0a123e7b65c..d8822780c80 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java
@@ -37,6 +37,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -175,7 +176,8 @@ public class DataTypeEditPartCN extends ClassifierEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java
index ff749430297..f35444d8e4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java
@@ -33,6 +33,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -152,7 +153,8 @@ public class DependencyNodeEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java
index 3625462dbba..55bd96aced5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java
@@ -33,6 +33,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -155,7 +156,8 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java
index 55b40d85324..a544b9d2037 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java
@@ -163,7 +163,8 @@ public class EnumerationEditPart extends ClassifierEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof org.eclipse.gmf.runtime.notation.BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java
index 6aa4ab8e911..4466b194803 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java
@@ -163,7 +163,8 @@ public class EnumerationEditPartCN extends ClassifierEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof org.eclipse.gmf.runtime.notation.BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPart.java
index 3576b2ddd0f..8900d210712 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPart.java
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -153,7 +154,8 @@ public class InformationItemEditPart extends ClassifierEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPartCN.java
index 4dbb9b4ffa6..902d5ccecc8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPartCN.java
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -153,7 +154,8 @@ public class InformationItemEditPartCN extends ClassifierEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java
index d3bcd8ea446..8367a0dee84 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java
@@ -35,6 +35,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -161,7 +162,8 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java
index 26a5d3c62f2..6a6d97ec015 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java
@@ -35,6 +35,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -161,7 +162,8 @@ public class InstanceSpecificationEditPartCN extends NamedElementEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java
index d0c9acce5c4..a5082598f8d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java
@@ -37,6 +37,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -173,7 +174,8 @@ public class InterfaceEditPart extends ClassifierEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java
index 6031e829f6f..9eab0258a49 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java
@@ -37,6 +37,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -175,7 +176,8 @@ public class InterfaceEditPartCN extends ClassifierEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java
index cf85025e8fc..a8558f9138e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java
@@ -35,6 +35,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -165,7 +166,8 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java
index 9a152288636..592fbcfd45b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java
@@ -35,6 +35,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -167,7 +168,8 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java
index ace1874008b..69789ebec37 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -147,7 +148,8 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java
index 96799a94e39..53f11e53195 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java
@@ -37,6 +37,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -175,7 +176,8 @@ public class SignalEditPart extends ClassifierEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java
index bf467a40bd8..2c91f5f9670 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java
@@ -37,6 +37,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -177,7 +178,8 @@ public class SignalEditPartCN extends ClassifierEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java
index b02d9c87b28..fe5cb1637e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java
@@ -33,6 +33,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -155,7 +156,8 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/parsers/MessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/parsers/MessageFormatParser.java
index 820f21bae6b..3d57fce2858 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/parsers/MessageFormatParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/parsers/MessageFormatParser.java
@@ -1,212 +1,214 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.parsers;

-

-import java.text.FieldPosition;

-import java.text.MessageFormat;

-import java.text.ParsePosition;

-

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

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

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

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

-import org.eclipse.gmf.tooling.runtime.parsers.AbstractAttributeParser;

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

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-

-/**

- * @generated

- */

-public class MessageFormatParser extends AbstractAttributeParser {

-

-	/**

-	 * @generated

-	 */

-	private String defaultPattern;

-

-	/**

-	 * @generated

-	 */

-	private String defaultEditablePattern;

-

-	/**

-	 * @generated

-	 */

-	private MessageFormat viewProcessor;

-

-	/**

-	 * @generated

-	 */

-	private MessageFormat editorProcessor;

-

-	/**

-	 * @generated

-	 */

-	private MessageFormat editProcessor;

-

-	/**

-	 * @generated

-	 */

-	public MessageFormatParser(EAttribute[] features) {

-		super(features);

-	}

-

-	/**

-	 * @generated

-	 */

-	public MessageFormatParser(EAttribute[] features, EAttribute[] editableFeatures) {

-		super(features, editableFeatures);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getDefaultPattern() {

-		if (defaultPattern == null) {

-			StringBuffer sb = new StringBuffer();

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

-				if (i > 0) {

-					sb.append(' ');

-				}

-				sb.append('{');

-				sb.append(i);

-				sb.append('}');

-			}

-			defaultPattern = sb.toString();

-		}

-		return defaultPattern;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setViewPattern(String viewPattern) {

-		super.setViewPattern(viewPattern);

-		viewProcessor = null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setEditorPattern(String editorPattern) {

-		super.setEditorPattern(editorPattern);

-		editorProcessor = null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected MessageFormat getViewProcessor() {

-		if (viewProcessor == null) {

-			viewProcessor = new MessageFormat(getViewPattern() == null ? getDefaultPattern() : getViewPattern());

-		}

-		return viewProcessor;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected MessageFormat getEditorProcessor() {

-		if (editorProcessor == null) {

-			editorProcessor = new MessageFormat(getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern());

-		}

-		return editorProcessor;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getDefaultEditablePattern() {

-		if (defaultEditablePattern == null) {

-			StringBuffer sb = new StringBuffer();

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

-				if (i > 0) {

-					sb.append(' ');

-				}

-				sb.append('{');

-				sb.append(i);

-				sb.append('}');

-			}

-			defaultEditablePattern = sb.toString();

-		}

-		return defaultEditablePattern;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setEditPattern(String editPattern) {

-		super.setEditPattern(editPattern);

-		editProcessor = null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected MessageFormat getEditProcessor() {

-		if (editProcessor == null) {

-			editProcessor = new MessageFormat(getEditPattern() == null ? getDefaultEditablePattern() : getEditPattern());

-		}

-		return editProcessor;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditString(IAdaptable adapter, int flags) {

-		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())));

-		}

-		return validateNewValues(values);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) {

-		Object[] values = getEditProcessor().parse(newString, new ParsePosition(0));

-		return getParseCommand(adapter, values, flags);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getPrintString(IAdaptable adapter, int flags) {

-		EObject element = (EObject) adapter.getAdapter(EObject.class);

-		return getViewProcessor().format(getValues(element), new StringBuffer(), new FieldPosition(0)).toString();

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.clazz.parsers;
+
+import java.text.FieldPosition;
+import java.text.MessageFormat;
+import java.text.ParsePosition;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.AbstractElementTypeBasedAttributeParser;
+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;
+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;
+
+/**
+ * @generated
+ */
+public class MessageFormatParser extends AbstractElementTypeBasedAttributeParser {
+
+	/**
+	 * @generated
+	 */
+	private String defaultPattern;
+
+	/**
+	 * @generated
+	 */
+	private String defaultEditablePattern;
+
+	/**
+	 * @generated
+	 */
+	private MessageFormat viewProcessor;
+
+	/**
+	 * @generated
+	 */
+	private MessageFormat editorProcessor;
+
+	/**
+	 * @generated
+	 */
+	private MessageFormat editProcessor;
+
+	/**
+	 * @generated
+	 */
+	public MessageFormatParser(EAttribute[] features) {
+		super(features);
+	}
+
+	/**
+	 * @generated
+	 */
+	public MessageFormatParser(EAttribute[] features, EAttribute[] editableFeatures) {
+		super(features, editableFeatures);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getDefaultPattern() {
+		if (defaultPattern == null) {
+			StringBuffer sb = new StringBuffer();
+			for (int i = 0; i < features.length; i++) {
+				if (i > 0) {
+					sb.append(' ');
+				}
+				sb.append('{');
+				sb.append(i);
+				sb.append('}');
+			}
+			defaultPattern = sb.toString();
+		}
+		return defaultPattern;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setViewPattern(String viewPattern) {
+		super.setViewPattern(viewPattern);
+		viewProcessor = null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setEditorPattern(String editorPattern) {
+		super.setEditorPattern(editorPattern);
+		editorProcessor = null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected MessageFormat getViewProcessor() {
+		if (viewProcessor == null) {
+			viewProcessor = new MessageFormat(getViewPattern() == null ? getDefaultPattern() : getViewPattern());
+		}
+		return viewProcessor;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected MessageFormat getEditorProcessor() {
+		if (editorProcessor == null) {
+			editorProcessor = new MessageFormat(getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern());
+		}
+		return editorProcessor;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getDefaultEditablePattern() {
+		if (defaultEditablePattern == null) {
+			StringBuffer sb = new StringBuffer();
+			for (int i = 0; i < editableFeatures.length; i++) {
+				if (i > 0) {
+					sb.append(' ');
+				}
+				sb.append('{');
+				sb.append(i);
+				sb.append('}');
+			}
+			defaultEditablePattern = sb.toString();
+		}
+		return defaultEditablePattern;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setEditPattern(String editPattern) {
+		super.setEditPattern(editPattern);
+		editProcessor = null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected MessageFormat getEditProcessor() {
+		if (editProcessor == null) {
+			editProcessor = new MessageFormat(getEditPattern() == null ? getDefaultEditablePattern() : getEditPattern());
+		}
+		return editProcessor;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditString(IAdaptable adapter, int flags) {
+		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())));
+		}
+		return validateNewValues(values);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) {
+		Object[] values = getEditProcessor().parse(newString, new ParsePosition(0));
+		return getParseCommand(adapter, values, flags);
+	}
+
+
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getPrintString(IAdaptable adapter, int flags) {
+		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.common/src/org/eclipse/papyrus/uml/diagram/common/parser/custom/AssociationMultiplicityParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/custom/AssociationMultiplicityParser.java
index 25659af9c02..061e471dc4f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/custom/AssociationMultiplicityParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/custom/AssociationMultiplicityParser.java
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.uml.diagram.common.parser.custom;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.uml.tools.utils.MultiplicityElementUtil;
 import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.UMLPackage;
 
@@ -41,29 +42,10 @@ public class AssociationMultiplicityParser extends AbstractAssociationEndParser
 	@Override
 	public String getPrintString(IAdaptable element, int flags) {
 		Property property = doAdapt(element);
-		StringBuffer displayedString = new StringBuffer();
 		if (property != null) {
-			if (property.getLower() == property.getUpper()) {
-				displayedString.append(property.getLower());
-			} else {
-				displayedString.append(validValue(property.getLower()));
-				displayedString.append("...");
-				displayedString.append(validValue(property.getUpper()));
-			}
+			return MultiplicityElementUtil.formatMultiplicity(property);
 		}
-		return displayedString.toString();
-	}
-
-	/**
-	 * Convert the int to a valid String to display. If the value is -1, then it
-	 * is converted to *
-	 *
-	 * @param val
-	 *            the int to convert to String
-	 * @return the valid string
-	 */
-	private String validValue(int val) {
-		return val == -1 ? "*" : String.valueOf(val);
+		return "";
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/PropertyRepresentation.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/PropertyRepresentation.java
index 06175be0e66..0f62b24e807 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/PropertyRepresentation.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/PropertyRepresentation.java
@@ -16,6 +16,7 @@ package org.eclipse.papyrus.uml.diagram.common.service.palette;
 import java.util.ArrayList;
 
 import org.eclipse.core.runtime.Assert;
+import org.eclipse.papyrus.uml.tools.utils.MultiplicityElementUtil;
 import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.Type;
 
@@ -157,15 +158,7 @@ public class PropertyRepresentation {
 	 */
 	protected String getPropertyMultiplicity() {
 		Assert.isNotNull(umlProperty, "The property has not been set!"); //$NON-NLS-1$
-		String multiplicity = "[" + umlProperty.getLower() + ".."; //$NON-NLS-1$ //$NON-NLS-2$
-		int upper = umlProperty.getUpper();
-		if (upper == -1) {
-			multiplicity += "*"; //$NON-NLS-1$
-		} else {
-			multiplicity += upper;
-		}
-		multiplicity += "]"; //$NON-NLS-1$
-		return multiplicity;
+		return MultiplicityElementUtil.formatMultiplicity(umlProperty);
 	}
 
 	/**
@@ -289,7 +282,7 @@ public class PropertyRepresentation {
 		if (getType() != null) {
 			type = getType().getLabel();
 		}
-		label += ": " + type + getPropertyMultiplicity() + " = " + getValueToDisplay(); //$NON-NLS-1$ //$NON-NLS-2$
+		label += ": " + type + " " + getPropertyMultiplicity() + " = " + getValueToDisplay(); //$NON-NLS-1$ //$NON-NLS-2$
 		return label;
 	}
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/DurationObservationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/DurationObservationEditPartCN.java
index c593578ee41..576eb6233b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/DurationObservationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/DurationObservationEditPartCN.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -147,7 +148,8 @@ public class DurationObservationEditPartCN extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/InteractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/InteractionEditPart.java
index 0b68d1355ee..6a6c1305105 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/InteractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/InteractionEditPart.java
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -151,7 +152,8 @@ public class InteractionEditPart extends AbstractInteractionEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/LifelineEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/LifelineEditPartCN.java
index b44b08f578a..820ab2963fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/LifelineEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/LifelineEditPartCN.java
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -151,7 +152,8 @@ public class LifelineEditPartCN extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ShortCutDiagramEditPart.java
index 5efece3aad8..3f782420626 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ShortCutDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ShortCutDiagramEditPart.java
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -143,7 +144,8 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/TimeObservationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/TimeObservationEditPartCN.java
index 04ea249428a..8fb04b8f150 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/TimeObservationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/TimeObservationEditPartCN.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -147,7 +148,8 @@ public class TimeObservationEditPartCN extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

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 548a7902422..0ccc1828f94 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -175,7 +176,8 @@ public class ComponentEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

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 0d3ba1e145f..ba227e05f93 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -175,7 +176,8 @@ public class ComponentEditPartCN extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

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 95b1e5b9273..aced9607fdc 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -175,7 +176,8 @@ public class ComponentEditPartPCN extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

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 a35ee21efe9..8cf23e2f86b 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
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -150,7 +151,8 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

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 70eb26d62ae..819b6c23390 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
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -152,7 +153,8 @@ public class InterfaceEditPartPCN extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					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 3cf536598b4..2e82bb6a7bb 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
@@ -31,6 +31,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -156,7 +157,8 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					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 7c0c959584d..c72f5d1ae67 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
@@ -35,6 +35,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -156,7 +157,8 @@ public class RectangleInterfaceEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

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 7ee482e12dc..e65995099aa 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
@@ -35,6 +35,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -156,7 +157,8 @@ public class RectangleInterfaceEditPartCN extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/parsers/MultiplicityLabelParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/parsers/MultiplicityLabelParser.java
index 7d3b931953a..9c512b31a49 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/parsers/MultiplicityLabelParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/parsers/MultiplicityLabelParser.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
 import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;
+import org.eclipse.papyrus.uml.tools.utils.MultiplicityElementUtil;
 import org.eclipse.uml2.uml.MultiplicityElement;
 import org.eclipse.uml2.uml.UMLPackage;
 
@@ -36,30 +36,13 @@ import org.eclipse.uml2.uml.UMLPackage;
  */
 public class MultiplicityLabelParser implements ISemanticParser {
 
-	/** The String format for displaying a {@link MultiplicityElement} multiplicity */
-	protected static final String MULTIPLICITY_FORMAT = "%s..%s";
-
 	@Override
 	public String getPrintString(IAdaptable element, int flags) {
-
-		String result = "";
 		EObject eObject = EMFHelper.getEObject(element);
-
 		if ((eObject != null) && (eObject instanceof MultiplicityElement)) {
-
-			MultiplicityElement multiplicity = (MultiplicityElement) eObject;
-
-			// manage multiplicity
-			String lower = ValueSpecificationUtil.getSpecificationValue(multiplicity.getLowerValue());
-			String upper = ValueSpecificationUtil.getSpecificationValue(multiplicity.getUpperValue());
-			if (multiplicity.getLower() != multiplicity.getUpper()) {
-				result = String.format(MULTIPLICITY_FORMAT, lower, upper);
-			} else {
-				result = lower;
-			}
+			return MultiplicityElementUtil.formatMultiplicityNoBrackets((MultiplicityElement) eObject);
 		}
-
-		return result;
+		return "";
 	}
 
 	@Override
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 c68c3bf46c5..b1ba4f386b7 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -156,19 +157,21 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 *Papyrus codeGen

-	 *@generated

+	 * Papyrus codeGen

+	 *

+	 * @generated

 	 **/

 	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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 ae4e60eb6d2..1cc1952dc00 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -164,11 +165,12 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 87a66a659d6..f60228ddab1 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 8945223aa4f..1378ca6b976 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
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -138,11 +139,12 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 840a1237eb0..5238f636142 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 79d8872f5cc..2f5ee5cbc3a 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 656e97ba852..8eaeec129f4 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -163,11 +164,12 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 b886905e937..f2733e83cde 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -163,11 +164,12 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 70d560216bc..0d5244bf8c2 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -148,11 +149,12 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 00d12c1a205..f2b18ee8d6e 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -148,11 +149,12 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 898e0ab7bc3..d26501dd95a 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -144,11 +145,12 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 ffc531954c5..bd80854b241 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -144,11 +145,12 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 b6645b03f6e..fcb34ad74ce 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -163,11 +164,12 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 d2e901d7588..a182cd1bfcf 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -163,11 +164,12 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 9e454f9529c..e81ba0450b1 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
@@ -35,6 +35,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -152,11 +153,12 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 0fca72d2ab5..f413388d405 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
@@ -35,6 +35,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -152,11 +153,12 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 f1aab6b79e6..3a1e09e5036 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 162e3605a43..cf8af31a856 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 84d92be2be1..7608c25de31 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -163,11 +164,12 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 f9fabc21038..edaaec97a90 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -163,11 +164,12 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 c76458a5f8d..e112aef36e5 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 8c06fe463c4..cf3f01ede6d 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 dfff017860a..430f2704712 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
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -146,11 +147,12 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 5c277652fb9..4c6757bf7b1 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
@@ -36,6 +36,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -154,11 +155,12 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 7a9ca8f2bc9..25cd9689d1b 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
@@ -36,6 +36,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -154,11 +155,12 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 e61e0c09aee..11fa9da6f08 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -163,11 +164,12 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 c5ce2e85082..b372a610bc8 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -163,11 +164,12 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 054b7a8bdf6..12c6aa80811 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 78dfe7d23ee..0f49c37c040 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -164,11 +165,12 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 e3a6316e192..29aad7ce4e2 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -164,11 +165,12 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 85b490e260b..146115b35f2 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -136,19 +137,21 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 *Papyrus codeGen

-	 *@generated

+	 * Papyrus codeGen

+	 *

+	 * @generated

 	 **/

 	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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 42a394721c1..91bf21fbbfe 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -144,11 +145,12 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 c46ff0e1336..b44793815dc 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 aa7b41b7bfd..df96c668fda 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -164,11 +165,12 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 02ae2d5e1f4..27976ee068c 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -164,11 +165,12 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 f75c5a8caa7..a2bbebd623c 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -146,11 +147,12 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 e56c97191b8..c68f3827b8f 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -146,11 +147,12 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 c034ad21d38..d28ff0c7c0b 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 670ce93a5dc..fc19ec3e648 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 539b9e91241..27f499e044b 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 19d90ab50fb..e3454f4b523 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 e9afae1e795..b56af8b5362 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 31f61f18025..0f980bd7731 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 1ad75271d65..3b361b121d2 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -163,11 +164,12 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 7253dd01bc2..0155f2de242 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -163,11 +164,12 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 02fa8837cc2..63b8461782d 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -164,11 +165,12 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 8cf2b700732..62280b5d4a0 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -164,11 +165,12 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 8139a95121d..63e8b3265ee 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 edd7815adf5..df2cb1aed4e 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
@@ -31,6 +31,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -147,11 +148,12 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 14a7393ffb3..41e74f74366 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
@@ -31,6 +31,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -152,11 +153,12 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 bea9aa25652..9b2b20a0689 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -146,11 +147,12 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 910df2928ea..3148978519e 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -146,11 +147,12 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 fd159df8109..6e3a71bc3d6 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -167,11 +168,12 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 c11c6fb3b63..541304b5638 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -164,11 +165,12 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 d5408245aa0..019fef7c84e 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -164,11 +165,12 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 99651a410c9..8e578202325 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 2f7f7a3cc4d..bddc7df6492 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 561dc2268cb..572bf395eec 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 cbb02c42048..8be9369b8a3 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -164,11 +165,12 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 4002f08e183..d5264d81148 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
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -164,11 +165,12 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 0da8641bd3f..3b04c2072fc 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 945a0061db8..74d0f561dbe 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 0965f5168e7..9fb402dfd13 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 1a3eff4c846..417b7dda90b 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 2b081295761..0e55a2e22b7 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
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -146,11 +147,12 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 4163b773046..105bef09ecd 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 9ec77c21ff1..91e9ba430dd 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
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -142,11 +143,12 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 		 * 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 (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

+				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

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 40eafa33f56..36f86a781e7 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,200 +1,200 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.parsers;

-

-import java.text.FieldPosition;

-import java.text.MessageFormat;

-import java.text.ParsePosition;

-

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

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

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

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

-import org.eclipse.gmf.tooling.runtime.parsers.AbstractAttributeParser;

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

-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

-

-/**

- * @generated

- */

-public class MessageFormatParser extends AbstractAttributeParser {

-

-	/**

-	 * @generated

-	 */

-	private String defaultPattern;

-

-	/**

-	 * @generated

-	 */

-	private String defaultEditablePattern;

-

-	/**

-	 * @generated

-	 */

-	private MessageFormat viewProcessor;

-

-	/**

-	 * @generated

-	 */

-	private MessageFormat editorProcessor;

-

-	/**

-	 * @generated

-	 */

-	private MessageFormat editProcessor;

-

-	/**

-	 * @generated

-	 */

-	public MessageFormatParser(EAttribute[] features) {

-		super(features);

-	}

-

-	/**

-	 * @generated

-	 */

-	public MessageFormatParser(EAttribute[] features, EAttribute[] editableFeatures) {

-		super(features, editableFeatures);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getDefaultPattern() {

-		if(defaultPattern == null) {

-			StringBuffer sb = new StringBuffer();

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

-				if(i > 0) {

-					sb.append(' ');

-				}

-				sb.append('{');

-				sb.append(i);

-				sb.append('}');

-			}

-			defaultPattern = sb.toString();

-		}

-		return defaultPattern;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setViewPattern(String viewPattern) {

-		super.setViewPattern(viewPattern);

-		viewProcessor = null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setEditorPattern(String editorPattern) {

-		super.setEditorPattern(editorPattern);

-		editorProcessor = null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected MessageFormat getViewProcessor() {

-		if(viewProcessor == null) {

-			viewProcessor = new MessageFormat(getViewPattern() == null ? getDefaultPattern() : getViewPattern());

-		}

-		return viewProcessor;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected MessageFormat getEditorProcessor() {

-		if(editorProcessor == null) {

-			editorProcessor = new MessageFormat(getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern());

-		}

-		return editorProcessor;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getDefaultEditablePattern() {

-		if(defaultEditablePattern == null) {

-			StringBuffer sb = new StringBuffer();

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

-				if(i > 0) {

-					sb.append(' ');

-				}

-				sb.append('{');

-				sb.append(i);

-				sb.append('}');

-			}

-			defaultEditablePattern = sb.toString();

-		}

-		return defaultEditablePattern;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setEditPattern(String editPattern) {

-		super.setEditPattern(editPattern);

-		editProcessor = null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected MessageFormat getEditProcessor() {

-		if(editProcessor == null) {

-			editProcessor = new MessageFormat(getEditPattern() == null ? getDefaultEditablePattern() : getEditPattern());

-		}

-		return editProcessor;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getEditString(IAdaptable adapter, int flags) {

-		EObject element = (EObject)adapter.getAdapter(EObject.class);

-		return getEditorProcessor().format(getEditableValues(element), new StringBuffer(), new FieldPosition(0)).toString();

-	}

-

-	/**

-	 * @generated

-	 */

-	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())));

-		}

-		return validateNewValues(values);

-	}

-

-	/**

-	 * @generated

-	 */

-	public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) {

-		Object[] values = getEditProcessor().parse(newString, new ParsePosition(0));

-		return getParseCommand(adapter, values, flags);

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getPrintString(IAdaptable adapter, int flags) {

-		EObject element = (EObject)adapter.getAdapter(EObject.class);

-		return getViewProcessor().format(getValues(element), new StringBuffer(), new FieldPosition(0)).toString();

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.parsers;
+
+import java.text.FieldPosition;
+import java.text.MessageFormat;
+import java.text.ParsePosition;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.AbstractElementTypeBasedAttributeParser;
+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
+
+/**
+ * @generated
+ */
+public class MessageFormatParser extends AbstractElementTypeBasedAttributeParser {
+
+	/**
+	 * @generated
+	 */
+	private String defaultPattern;
+
+	/**
+	 * @generated
+	 */
+	private String defaultEditablePattern;
+
+	/**
+	 * @generated
+	 */
+	private MessageFormat viewProcessor;
+
+	/**
+	 * @generated
+	 */
+	private MessageFormat editorProcessor;
+
+	/**
+	 * @generated
+	 */
+	private MessageFormat editProcessor;
+
+	/**
+	 * @generated
+	 */
+	public MessageFormatParser(EAttribute[] features) {
+		super(features);
+	}
+
+	/**
+	 * @generated
+	 */
+	public MessageFormatParser(EAttribute[] features, EAttribute[] editableFeatures) {
+		super(features, editableFeatures);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getDefaultPattern() {
+		if(defaultPattern == null) {
+			StringBuffer sb = new StringBuffer();
+			for(int i = 0; i < features.length; i++) {
+				if(i > 0) {
+					sb.append(' ');
+				}
+				sb.append('{');
+				sb.append(i);
+				sb.append('}');
+			}
+			defaultPattern = sb.toString();
+		}
+		return defaultPattern;
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setViewPattern(String viewPattern) {
+		super.setViewPattern(viewPattern);
+		viewProcessor = null;
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setEditorPattern(String editorPattern) {
+		super.setEditorPattern(editorPattern);
+		editorProcessor = null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected MessageFormat getViewProcessor() {
+		if(viewProcessor == null) {
+			viewProcessor = new MessageFormat(getViewPattern() == null ? getDefaultPattern() : getViewPattern());
+		}
+		return viewProcessor;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected MessageFormat getEditorProcessor() {
+		if(editorProcessor == null) {
+			editorProcessor = new MessageFormat(getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern());
+		}
+		return editorProcessor;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getDefaultEditablePattern() {
+		if(defaultEditablePattern == null) {
+			StringBuffer sb = new StringBuffer();
+			for(int i = 0; i < editableFeatures.length; i++) {
+				if(i > 0) {
+					sb.append(' ');
+				}
+				sb.append('{');
+				sb.append(i);
+				sb.append('}');
+			}
+			defaultEditablePattern = sb.toString();
+		}
+		return defaultEditablePattern;
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setEditPattern(String editPattern) {
+		super.setEditPattern(editPattern);
+		editProcessor = null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected MessageFormat getEditProcessor() {
+		if(editProcessor == null) {
+			editProcessor = new MessageFormat(getEditPattern() == null ? getDefaultEditablePattern() : getEditPattern());
+		}
+		return editProcessor;
+	}
+
+	/**
+	 * @generated
+	 */
+	public String getEditString(IAdaptable adapter, int flags) {
+		EObject element = (EObject)adapter.getAdapter(EObject.class);
+		return getEditorProcessor().format(getEditableValues(element), new StringBuffer(), new FieldPosition(0)).toString();
+	}
+
+	/**
+	 * @generated
+	 */
+	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())));
+		}
+		return validateNewValues(values);
+	}
+
+	/**
+	 * @generated
+	 */
+	public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) {
+		Object[] values = getEditProcessor().parse(newString, new ParsePosition(0));
+		return getParseCommand(adapter, values, flags);
+	}
+
+	/**
+	 * @generated
+	 */
+	public String getPrintString(IAdaptable adapter, int flags) {
+		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.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPart.java
index fe8d3ec9206..0de48f91b3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPart.java
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -157,7 +158,8 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartACN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartACN.java
index feb72347227..f996a4f013f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartACN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartACN.java
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -157,7 +158,8 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartCN.java
index 4725d5e31e9..d4dd45c0c74 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartCN.java
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -157,7 +158,8 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/interactionoverviewdiagram.palette.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/interactionoverviewdiagram.palette.xml
index 857a1c1984a..62bdd2dfc79 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/interactionoverviewdiagram.palette.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/interactionoverviewdiagram.palette.xml
@@ -6,85 +6,85 @@
                 description="Create a new Activity"
                 id="interactionoverviewdiagram.tool.activity"
                 name="Activity"
-                refToolId="createActivity1CreationTool">
+                refToolId="activity.nodes.activity">
             </aspectTool>
              <aspectTool
                 description="Create a new InteractionUse"
                 id="interactionoverviewdiagram.tool.callbehavioraction"
                 name="InteractionUse"
-                refToolId="createCallBehaviorAction2CreationTool">
+                refToolId="activity.nodes.invocationactions.callbehavioraction">
             </aspectTool>
             <aspectTool
                 description="Create a new InitialNode"
                 id="interactionoverviewdiagram.tool.initialnode"
                 name="InitialNode"
-                refToolId="createInitialnode1CreationTool">
+                refToolId="activity.nodes.controlnodes.initialnode">
             </aspectTool>
             <aspectTool
                 description="Create a new ActivityFinalNode"
                 id="interactionoverviewdiagram.tool.activityfinalnode"
                 name="ActivityFinalNode"
-                refToolId="createActivityfinal2CreationTool">
+                refToolId="activity.nodes.controlnodes.activityfinal">
             </aspectTool>
             <aspectTool
                 description="Create a new FlowFinalNode"
                 id="interactionoverviewdiagram.tool.flowfinalnode"
                 name="FlowFinalNode"
-                refToolId="createFlowfinal3CreationTool">
+                refToolId="activity.nodes.controlnodes.flowfinal">
             </aspectTool>
             <aspectTool
                 description="Create a new DecisionNode"
                 id="interactionoverviewdiagram.tool.decisionnode"
                 name="DecisionNode"
-                refToolId="createDecisionnode4CreationTool">
+                refToolId="activity.nodes.controlnodes.decisionnode">
             </aspectTool>
             <aspectTool
                 description="Create a new ForkNode"
                 id="interactionoverviewdiagram.tool.forknode"
                 name="ForkNode"
-                refToolId="createForknode7CreationTool">
+                refToolId="activity.nodes.controlnodes.forknode">
             </aspectTool>
             <aspectTool
                 description="Create a new JoinNode"
                 id="interactionoverviewdiagram.tool.joinnode"
                 name="JoinNode"
-                refToolId="createJoinnode6CreationTool">
+                refToolId="activity.nodes.controlnodes.joinnode">
             </aspectTool>
             <aspectTool
                 description="Create a new MergeNode"
                 id="interactionoverviewdiagram.tool.mergenode"
                 name="MergeNode"
-                refToolId="createMergenode5CreationTool">
+                refToolId="activity.nodes.controlnodes.mergenode">
             </aspectTool>
              <aspectTool
                 description="Create a new ConditionalNode"
                 id="interactionoverviewdiagram.tool.conditionalnode"
                 name="ConditionalNode"
-                refToolId="createConditionalNode4CreationTool">
+                refToolId="activity.nodes.structuredactions.conditionalnode">
             </aspectTool>
             <aspectTool
                 description="Create a new LoopNode"
                 id="interactionoverviewdiagram.tool.loopnode"
                 name="LoopNode"
-                refToolId="createLoopNode2CreationTool">
+                refToolId="activity.nodes.structuredactions.loopnode">
             </aspectTool>
              <aspectTool
                 description="Create a new SequenceNode"
                 id="interactionoverviewdiagram.tool.sequencenode"
                 name="SequenceNode"
-                refToolId="createSequenceNode3CreationTool">
+                refToolId="activity.nodes.structuredactions.sequencenode">
             </aspectTool>
             <aspectTool
                 description="Create a new Comment"
                 id="interactionoverviewdiagram.tool.comment"
                 name="Comment"
-                refToolId="createComment5CreationTool">
+                refToolId="activity.nodes.comment">
             </aspectTool>
             <aspectTool
                 description="Create a new Constraint"
                 id="interactionoverviewdiagram.tool.constraint"
                 name="Constraint"
-                refToolId="createConstraint6CreationTool">
+                refToolId="activity.nodes.constraint">
             </aspectTool>
             </drawer>
             <drawer id="interactionoverview.drawer.edges" name="Edges" iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
@@ -92,13 +92,13 @@
                 description="Create a new CommentAnnotatedElement"
                 id="interactionoverviewdiagram.tool.commentannotatedelement"
                 name="CommentAnnotatedElement"
-                refToolId="createLink4CreationTool">
+                refToolId="activity.edges.link">
             </aspectTool>
             <aspectTool
                 description="Create a new ControlFlow"
                 id="interactionoverviewdiagram.tool.controlflow"
                 name="ControlFlow"
-                refToolId="createControlFlow1CreationTool">
+                refToolId="activity.edges.controlflow">
             </aspectTool>
 
         </drawer>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramEditPartProvider.java
index 750fbcd95b7..2ebf7898981 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramEditPartProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramEditPartProvider.java
@@ -15,10 +15,21 @@ import org.eclipse.gmf.runtime.common.core.service.IOperation;
 import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
 import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
 import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;
 import org.eclipse.papyrus.uml.diagram.activity.providers.CustomUMLEditPartProvider;
 
 public class InheritedActivityDiagramEditPartProvider extends CustomUMLEditPartProvider {
 
+	/**
+	 * This is workaround for bug #464093. 
+	 * The view type 'compartment_shape_display' is auxiliary and is provided externally 
+	 * (from the org.eclipse.papyrus.uml.diagram.symbols plugin) for all diagrams. 
+	 * 
+	 * Views of this kind shares semantic element with the main node so we can't distinguish them by semantic checks 
+	 * and have to explicitly rule them out to avoid interferention
+	 */
+	public static final String ALIEN_VIEW_TYPE = IShapeCompartmentEditPart.VIEW_TYPE;
+
 	@Override
 	public synchronized boolean provides(final IOperation operation) {
 		if (operation instanceof CreateGraphicEditPartOperation) {
@@ -29,6 +40,10 @@ public class InheritedActivityDiagramEditPartProvider extends CustomUMLEditPartP
 				return false;
 			}
 
+			if (ALIEN_VIEW_TYPE.equals(view.getType())) {
+				return false;
+			}
+
 			// Test supported inherited types
 			final EObject eobject = view.getElement();
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java
index ee4e441be5f..076513690b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java
@@ -33,6 +33,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -145,7 +146,8 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java
index 6e4c96cf40e..442a930457d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java
@@ -78,6 +78,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineDotLineCustomFigure;
 import org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineFigure;
 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.sequence.util.CombinedFragmentMoveHelper;
 import org.eclipse.papyrus.uml.diagram.sequence.util.HighlightUtil;
 import org.eclipse.papyrus.uml.diagram.sequence.util.LifelineEditPartUtil;
 import org.eclipse.papyrus.uml.diagram.sequence.util.LifelineHeadUtil;
@@ -158,9 +159,6 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy
 					if (resizeChildrenCommand != null && resizeChildrenCommand.canExecute()) {
 						compoundCmd.add(resizeChildrenCommand);
 					}
-					// else if(resizeChildrenCommand != null) {
-					// return UnexecutableCommand.INSTANCE;
-					// }
 				}
 				if (hasCreateLink && !LifelineMessageCreateHelper.canMoveLifelineVertical((LifelineEditPart) child, (Rectangle) translateToModelConstraint(constraintFor))) {
 					return UnexecutableCommand.INSTANCE;
@@ -487,6 +485,7 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy
 				for (InteractionOperandEditPart ioEP : interactionOperandEditParts) {
 					InteractionOperand io = (InteractionOperand) ioEP.resolveSemanticElement();
 					Rectangle newBoundsIO = SequenceUtil.getAbsoluteBounds(ioEP);
+					Rectangle oldBoundsIO = newBoundsIO.getCopy(); 
 					// apply the move delta which will impact all operands
 					newBoundsIO.translate(moveDelta);
 					// calculate the new bounds of the interaction operand
@@ -496,7 +495,9 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy
 					if (firstOperand.equals(io)) {
 						// used to compensate the height of the "header" where the OperandKind is stored
 						newBoundsIO.y -= headerHeight;
+						oldBoundsIO.y -= headerHeight;
 						newBoundsIO.height += headerHeight;
+						oldBoundsIO.height += headerHeight;
 					}
 					// ignore current CF and enclosed IO
 					Set<InteractionFragment> ignoreSet = new HashSet<InteractionFragment>();
@@ -513,15 +514,32 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy
 					// => the interaction fragment that are inside an other container (like an enclosed CF) are not modified
 					for (InteractionFragment ift : coveredInteractionFragments) {
 						if (!cf.equals(ift)) {
+							if (ift instanceof CombinedFragment) {
+								// don't change CF hierarchy during resizing at all
+								continue;
+							}
 							Interaction interactionOwner = ift.getEnclosingInteraction();
 							InteractionOperand ioOwner = ift.getEnclosingOperand();
-							if ((ioOwner != null && (ioOwner.equals(cf.getEnclosingOperand()) || cf.equals(ioOwner.getOwner()))) || (interactionOwner != null && (interactionOwner.equals(cf.getEnclosingInteraction()) || cf.equals(interactionOwner.getOwner())))) {
+							if ((ioOwner != null && (ioOwner.equals(cf.getEnclosingOperand()) || cf.equals(ioOwner.getOwner()))) 
+									|| (interactionOwner != null && (interactionOwner.equals(cf.getEnclosingInteraction()) || cf.equals(interactionOwner.getOwner())))) {
 								compoundCmd.add(new ICommandProxy(SequenceUtil.getSetEnclosingInteractionCommand(ioEP.getEditingDomain(), ift, io)));
 							}
 						}
 					}
+					Point offsetInnerCFs = new Point(oldBoundsIO.x - newBoundsIO.x, 0);
+					if (firstOperand.equals(io)) {
+						offsetInnerCFs.y = oldBoundsIO.y - newBoundsIO.y; // no need to adjust other IOs
+					}
+					Command adjustInnerCFsCommand = CombinedFragmentMoveHelper.getShiftEnclosedCFsCommand(ioEP, offsetInnerCFs); 
+					if (adjustInnerCFsCommand != null) {
+						compoundCmd.add(adjustInnerCFsCommand);
+					}
 				}
 				for (InteractionFragment ift : notCoveredAnymoreInteractionFragments) {
+					if (ift instanceof CombinedFragment) {
+						// don't change CF hierarchy during resizing at all
+						continue;
+					}
 					if (cf.getEnclosingOperand() != null) {
 						compoundCmd.add(new ICommandProxy(SequenceUtil.getSetEnclosingInteractionCommand(combinedFragmentEditPart.getEditingDomain(), ift, cf.getEnclosingOperand())));
 					} else {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java
index b7243934544..f538046d3db 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java
@@ -830,7 +830,9 @@ public class OperandBoundsComputeHelper {
 	}

 

 	/**

-	 * Check if operation resizing on CombinedFragment is allowed

+	 * Check if operation resizing on CombinedFragment is allowed:

+	 * Height of its operands must be at least of OperandBoundsComputeHelper.MIN_INTERACTION_OPERAND_HEIGHT

+	 * after the resize

 	 *

 	 * @param request

 	 * @param child

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java
index c8c275c8f99..819859732bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java
@@ -1030,7 +1030,7 @@ public class SequenceUtil {
 	 * @param ignoreSet

 	 *            a set of ift to ignore.

 	 * @return

-	 *         a set containing the covered ift or null if an ift not ignored is not fully covered.

+	 *         a set containing ift at least partially covered by the rectangle.

 	 */

 	@SuppressWarnings("unchecked")

 	public static Set<InteractionFragment> getCoveredInteractionFragments(Rectangle selectionRect, EditPart hostEditPart, Set<InteractionFragment> ignoreSet) {

@@ -1047,21 +1047,16 @@ public class SequenceUtil {
 				EObject elem = sep.getNotationView().getElement();

 				if (elem instanceof InteractionFragment && !ignoreSet.contains(elem)) {

 					Rectangle figureBounds = getAbsoluteBounds(sep);

-					// keep the fragment if its figure is completely in the selection

-					// if it is inside but not completely this method return null

-					if (selectionRect.contains(figureBounds)) {

+					Rectangle intersection = selectionRect.getIntersection(figureBounds);

+					// keep the fragment if its figure is at least partially in the selection

+					if (!intersection.isEmpty()) {

 						coveredInteractionFragments.add((InteractionFragment) elem);

 						if (elem instanceof ExecutionSpecification) {

 							ExecutionSpecification es = (ExecutionSpecification) elem;

 							coveredInteractionFragments.add(es.getStart());

 							coveredInteractionFragments.add(es.getFinish());

 						}

-					} else {

-						Rectangle intersection = selectionRect.getIntersection(figureBounds);

-						if (!intersection.equals(new Rectangle()) && !intersection.equals(selectionRect)) {

-							return null;

-						}

-					}

+					} 

 				}

 			} else if (ep instanceof ConnectionEditPart) {

 				ConnectionEditPart cep = (ConnectionEditPart) ep;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.gmfgen
index 6d290b012e4..43e20682c30 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.gmfgen
@@ -2342,6 +2342,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Region.gif"

               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Region.gif"

               createMethodName="createRegionCreationTool"

+              id="&quot;statemachine.createNodesGroup.region&quot;"

               genNodes="/0/@diagram/@childNodes.0"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

@@ -2350,6 +2351,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif"

               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif"

               createMethodName="createStateCreationTool"

+              id="&quot;statemachine.createNodesGroup.state&quot;"

               genNodes="/0/@diagram/@childNodes.2"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

@@ -2358,6 +2360,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_initial.gif"

               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_initial.gif"

               createMethodName="createInitialCreationTool"

+              id="&quot;statemachine.createNodesGroup.initial&quot;"

               genNodes="/0/@diagram/@childNodes.3"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

@@ -2366,6 +2369,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FinalState.gif"

               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FinalState.gif"

               createMethodName="createFinalStateCreationTool"

+              id="&quot;statemachine.createNodesGroup.finalstate&quot;"

               genNodes="/0/@diagram/@childNodes.1"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

@@ -2374,6 +2378,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_shallowHistory.gif"

               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_shallowHistory.gif"

               createMethodName="createShallowHistoryCreationTool"

+              id="&quot;statemachine.createNodesGroup.shallowhistory&quot;"

               genNodes="/0/@diagram/@childNodes.8"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

@@ -2382,6 +2387,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_deepHistory.gif"

               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_deepHistory.gif"

               createMethodName="createDeepHistoryCreationTool"

+              id="&quot;statemachine.createNodesGroup.deephistory&quot;"

               genNodes="/0/@diagram/@childNodes.9"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

@@ -2390,6 +2396,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_fork.gif"

               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_fork.gif"

               createMethodName="createForkCreationTool"

+              id="&quot;statemachine.createNodesGroup.fork&quot;"

               genNodes="/0/@diagram/@childNodes.5"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

@@ -2398,6 +2405,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_join.gif"

               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_join.gif"

               createMethodName="createJoinCreationTool"

+              id="&quot;statemachine.createNodesGroup.join&quot;"

               genNodes="/0/@diagram/@childNodes.4"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

@@ -2406,6 +2414,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_choice.gif"

               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_choice.gif"

               createMethodName="createChoiceCreationTool"

+              id="&quot;statemachine.createNodesGroup.choice&quot;"

               genNodes="/0/@diagram/@childNodes.6"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

@@ -2414,6 +2423,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_junction.gif"

               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_junction.gif"

               createMethodName="createJunctionCreationTool"

+              id="&quot;statemachine.createNodesGroup.junction&quot;"

               genNodes="/0/@diagram/@childNodes.7"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

@@ -2422,6 +2432,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_entryPoint.gif"

               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_entryPoint.gif"

               createMethodName="createEntryPointCreationTool"

+              id="&quot;statemachine.createNodesGroup.entrypoint&quot;"

               genNodes="/0/@diagram/@childNodes.11"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

@@ -2430,6 +2441,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_exitPoint.gif"

               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_exitPoint.gif"

               createMethodName="createExitPointCreationTool"

+              id="&quot;statemachine.createNodesGroup.exitpoint&quot;"

               genNodes="/0/@diagram/@childNodes.12"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

@@ -2438,6 +2450,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_terminate.gif"

               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_terminate.gif"

               createMethodName="createTerminateCreationTool"

+              id="&quot;statemachine.createNodesGroup.terminate&quot;"

               genNodes="/0/@diagram/@childNodes.10"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

@@ -2446,6 +2459,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectionPointReference.gif"

               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectionPointReference.gif"

               createMethodName="createConnectionPointReferenceCreationTool"

+              id="&quot;statemachine.createNodesGroup.connectionpointreference&quot;"

               genNodes="/0/@diagram/@childNodes.13"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

@@ -2454,6 +2468,7 @@
               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="createStateMachineCommentCreationTool"

+              id="&quot;statemachine.createNodesGroup.comment&quot;"

               genNodes="/0/@diagram/@childNodes.14"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

@@ -2462,6 +2477,7 @@
               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;statemachine.createNodesGroup.constraint&quot;"

               genNodes="/0/@diagram/@childNodes.15"/>

         </groups>

         <groups

@@ -2477,6 +2493,7 @@
               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Transition_local.gif"

               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Transition_local.gif"

               createMethodName="createTransitionCreationTool"

+              id="&quot;statemachine.createEdgesGroup.transition&quot;"

               qualifiedToolName=""

               genLinks="/0/@diagram/@links.0"/>

           <entries

@@ -2486,6 +2503,7 @@
               largeIconPath="icons/obj16/Link.gif"

               smallIconPath="icons/obj16/Link.gif"

               createMethodName="createCommentlinkCreationTool"

+              id="&quot;statemachine.createEdgesGroup.link&quot;"

               genLinks="/0/@diagram/@links.2 /0/@diagram/@links.3"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

@@ -2493,6 +2511,7 @@
               description="Creation of a context link for a Constraint"

               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"

               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"

+              id="&quot;statemachine.createEdgesGroup.contextlink&quot;"

               genLinks="/0/@diagram/@links.4"/>

         </groups>

       </palette>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
index 5936e334466..beb943f7723 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
@@ -450,193 +450,193 @@
 				<entry
 				      defineOnly="true"
 				      description="Region"
-				      id="createRegionCreationTool"
+				      id="statemachine.createNodesGroup.region"
 				      kind="tool"
 				      label="Region"
 				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Region.gif"
 				      path=""
 				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Region.gif">
-					</entry>
+				</entry>
 				<entry
 				      defineOnly="true"
 				      description="State"
-				      id="createStateCreationTool"
+				      id="statemachine.createNodesGroup.state"
 				      kind="tool"
 				      label="State"
 				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif"
 				      path=""
 				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif">
-					</entry>
+				</entry>
 				<entry
 				      defineOnly="true"
 				      description="Initial"
-				      id="createInitialCreationTool"
+				      id="statemachine.createNodesGroup.initial"
 				      kind="tool"
 				      label="Initial"
 				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_initial.gif"
 				      path=""
 				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_initial.gif">
-					</entry>
+				</entry>
 				<entry
 				      defineOnly="true"
 				      description="FinalState"
-				      id="createFinalStateCreationTool"
+				      id="statemachine.createNodesGroup.finalstate"
 				      kind="tool"
 				      label="FinalState"
 				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FinalState.gif"
 				      path=""
 				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FinalState.gif">
-					</entry>
+				</entry>
 				<entry
 				      defineOnly="true"
 				      description="ShallowHistory"
-				      id="createShallowHistoryCreationTool"
+				      id="statemachine.createNodesGroup.shallowhistory"
 				      kind="tool"
 				      label="ShallowHistory"
 				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_shallowHistory.gif"
 				      path=""
 				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_shallowHistory.gif">
-					</entry>
+				</entry>
 				<entry
 				      defineOnly="true"
 				      description="DeepHistory"
-				      id="createDeepHistoryCreationTool"
+				      id="statemachine.createNodesGroup.deephistory"
 				      kind="tool"
 				      label="DeepHistory"
 				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_deepHistory.gif"
 				      path=""
 				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_deepHistory.gif">
-					</entry>
+				</entry>
 				<entry
 				      defineOnly="true"
 				      description="Fork"
-				      id="createForkCreationTool"
+				      id="statemachine.createNodesGroup.fork"
 				      kind="tool"
 				      label="Fork"
 				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_fork.gif"
 				      path=""
 				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_fork.gif">
-					</entry>
+				</entry>
 				<entry
 				      defineOnly="true"
 				      description="Join"
-				      id="createJoinCreationTool"
+				      id="statemachine.createNodesGroup.join"
 				      kind="tool"
 				      label="Join"
 				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_join.gif"
 				      path=""
 				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_join.gif">
-					</entry>
+				</entry>
 				<entry
 				      defineOnly="true"
 				      description="Choice"
-				      id="createChoiceCreationTool"
+				      id="statemachine.createNodesGroup.choice"
 				      kind="tool"
 				      label="Choice"
 				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_choice.gif"
 				      path=""
 				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_choice.gif">
-					</entry>
+				</entry>
 				<entry
 				      defineOnly="true"
 				      description="Junction"
-				      id="createJunctionCreationTool"
+				      id="statemachine.createNodesGroup.junction"
 				      kind="tool"
 				      label="Junction"
 				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_junction.gif"
 				      path=""
 				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_junction.gif">
-					</entry>
+				</entry>
 				<entry
 				      defineOnly="true"
 				      description="EntryPoint"
-				      id="createEntryPointCreationTool"
+				      id="statemachine.createNodesGroup.entrypoint"
 				      kind="tool"
 				      label="EntryPoint"
 				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_entryPoint.gif"
 				      path=""
 				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_entryPoint.gif">
-					</entry>
+				</entry>
 				<entry
 				      defineOnly="true"
 				      description="ExitPoint"
-				      id="createExitPointCreationTool"
+				      id="statemachine.createNodesGroup.exitpoint"
 				      kind="tool"
 				      label="ExitPoint"
 				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_exitPoint.gif"
 				      path=""
 				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_exitPoint.gif">
-					</entry>
+				</entry>
 				<entry
 				      defineOnly="true"
 				      description="Terminate"
-				      id="createTerminateCreationTool"
+				      id="statemachine.createNodesGroup.terminate"
 				      kind="tool"
 				      label="Terminate"
 				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_terminate.gif"
 				      path=""
 				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_terminate.gif">
-					</entry>
+				</entry>
 				<entry
 				      defineOnly="true"
 				      description="ConnectionPointReference"
-				      id="createConnectionPointReferenceCreationTool"
+				      id="statemachine.createNodesGroup.connectionpointreference"
 				      kind="tool"
 				      label="ConnectionPointReference"
 				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectionPointReference.gif"
 				      path=""
 				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectionPointReference.gif">
-					</entry>
+				</entry>
 				<entry
 				      defineOnly="true"
 				      description="Comment"
-				      id="createStateMachineCommentCreationTool"
+				      id="statemachine.createNodesGroup.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>
 				<entry
 				      defineOnly="true"
 				      description="Create Constraint"
-				      id="createConstraintCreationTool"
+				      id="statemachine.createNodesGroup.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>
 				<entry
 				      defineOnly="true"
 				      description="Transition"
-				      id="createTransitionCreationTool"
+				      id="statemachine.createEdgesGroup.transition"
 				      kind="tool"
 				      label="Transition"
 				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Transition_local.gif"
 				      path=""
 				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Transition_local.gif">
-					</entry>
+				</entry>
 				<entry
 				      defineOnly="true"
 				      description="Creation of a link for comment, constraint"
-				      id="createCommentlinkCreationTool"
+				      id="statemachine.createEdgesGroup.link"
 				      kind="tool"
 				      label="Link"
 				      large_icon="icons/obj16/Link.gif"
 				      path=""
 				      small_icon="icons/obj16/Link.gif">
-					</entry>
+				</entry>
 				<entry
 				      defineOnly="true"
 				      description="Creation of a context link for a Constraint"
-				      id="createContextLink3CreationTool"
+				      id="statemachine.createEdgesGroup.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>
 				
 				</contribution>
 			</paletteProvider>	
@@ -670,67 +670,67 @@
 		   </expand>
 		</entry>
 		<predefinedEntry
-		        id="createRegionCreationTool"
+		        id="statemachine.createNodesGroup.region"
 				path="/createNodesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createStateCreationTool"
+		        id="statemachine.createNodesGroup.state"
 				path="/createNodesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createInitialCreationTool"
+		        id="statemachine.createNodesGroup.initial"
 				path="/createNodesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createFinalStateCreationTool"
+		        id="statemachine.createNodesGroup.finalstate"
 				path="/createNodesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createShallowHistoryCreationTool"
+		        id="statemachine.createNodesGroup.shallowhistory"
 				path="/createNodesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createDeepHistoryCreationTool"
+		        id="statemachine.createNodesGroup.deephistory"
 				path="/createNodesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createForkCreationTool"
+		        id="statemachine.createNodesGroup.fork"
 				path="/createNodesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createJoinCreationTool"
+		        id="statemachine.createNodesGroup.join"
 				path="/createNodesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createChoiceCreationTool"
+		        id="statemachine.createNodesGroup.choice"
 				path="/createNodesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createJunctionCreationTool"
+		        id="statemachine.createNodesGroup.junction"
 				path="/createNodesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createEntryPointCreationTool"
+		        id="statemachine.createNodesGroup.entrypoint"
 				path="/createNodesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createExitPointCreationTool"
+		        id="statemachine.createNodesGroup.exitpoint"
 				path="/createNodesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createTerminateCreationTool"
+		        id="statemachine.createNodesGroup.terminate"
 				path="/createNodesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createConnectionPointReferenceCreationTool"
+		        id="statemachine.createNodesGroup.connectionpointreference"
 				path="/createNodesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createStateMachineCommentCreationTool"
+		        id="statemachine.createNodesGroup.comment"
 				path="/createNodesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createConstraintCreationTool"
+		        id="statemachine.createNodesGroup.constraint"
 				path="/createNodesGroup">
 		  </predefinedEntry>
 		<entry
@@ -746,15 +746,15 @@
 		   </expand>
 		</entry>
 		<predefinedEntry
-		        id="createTransitionCreationTool"
+		        id="statemachine.createEdgesGroup.transition"
 				path="/createEdgesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createCommentlinkCreationTool"
+		        id="statemachine.createEdgesGroup.link"
 				path="/createEdgesGroup">
 		  </predefinedEntry>
 		<predefinedEntry
-		        id="createContextLink3CreationTool"
+		        id="statemachine.createEdgesGroup.contextlink"
 				path="/createEdgesGroup">
 		  </predefinedEntry>
 		</contribution>
@@ -777,73 +777,73 @@
 			class="org.eclipse.papyrus.uml.diagram.statemachine.custom.preferences.CustomTransitionPreferenceInitializer">
 		</initializer>
 	</extension>
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping"> 

-   <?gmfgen generated="true"?>

-   <diagramMappings diagramID="PapyrusUMLStateMachineDiagram">

-   	<mapping type="PapyrusUMLStateMachineDiagram" humanReadableType="StateMachineDiagram"/>

-			<mapping

-				humanReadableType="Region"

-				type="3002">

-			</mapping>

-			<mapping

-				humanReadableType="StateMachine"

-				type="2002">

-			</mapping>

-			<mapping

-				humanReadableType="State"

-				type="6002">

-			</mapping>

-			<mapping

-				humanReadableType="Floating Label"

-				type="5001">

-			</mapping>

-			<mapping

-				humanReadableType="Floating Label"

-				type="19003">

-			</mapping>

-			<mapping

-				humanReadableType="Floating Label"

-				type="8001">

-			</mapping>

-			<mapping

-				humanReadableType="Floating Label"

-				type="9001">

-			</mapping>

-			<mapping

-				humanReadableType="Floating Label"

-				type="10001">

-			</mapping>

-			<mapping

-				humanReadableType="Floating Label"

-				type="11001">

-			</mapping>

-			<mapping

-				humanReadableType="Floating Label"

-				type="12001">

-			</mapping>

-			<mapping

-				humanReadableType="Floating Label"

-				type="13001">

-			</mapping>

-			<mapping

-				humanReadableType="Floating Label"

-				type="14001">

-			</mapping>

-			<mapping

-				humanReadableType="Floating Label"

-				type="15001">

-			</mapping>

-			<mapping

-				humanReadableType="Floating Label"

-				type="16001">

-			</mapping>

-			<mapping

-				humanReadableType="Floating Label"

-				type="17001">

-			</mapping>

-   </diagramMappings>

-</extension>

-

+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping"> 
+   <?gmfgen generated="true"?>
+   <diagramMappings diagramID="PapyrusUMLStateMachineDiagram">
+   	<mapping type="PapyrusUMLStateMachineDiagram" humanReadableType="StateMachineDiagram"/>
+			<mapping
+				humanReadableType="Region"
+				type="3002">
+			</mapping>
+			<mapping
+				humanReadableType="StateMachine"
+				type="2002">
+			</mapping>
+			<mapping
+				humanReadableType="State"
+				type="6002">
+			</mapping>
+			<mapping
+				humanReadableType="Floating Label"
+				type="5001">
+			</mapping>
+			<mapping
+				humanReadableType="Floating Label"
+				type="19003">
+			</mapping>
+			<mapping
+				humanReadableType="Floating Label"
+				type="8001">
+			</mapping>
+			<mapping
+				humanReadableType="Floating Label"
+				type="9001">
+			</mapping>
+			<mapping
+				humanReadableType="Floating Label"
+				type="10001">
+			</mapping>
+			<mapping
+				humanReadableType="Floating Label"
+				type="11001">
+			</mapping>
+			<mapping
+				humanReadableType="Floating Label"
+				type="12001">
+			</mapping>
+			<mapping
+				humanReadableType="Floating Label"
+				type="13001">
+			</mapping>
+			<mapping
+				humanReadableType="Floating Label"
+				type="14001">
+			</mapping>
+			<mapping
+				humanReadableType="Floating Label"
+				type="15001">
+			</mapping>
+			<mapping
+				humanReadableType="Floating Label"
+				type="16001">
+			</mapping>
+			<mapping
+				humanReadableType="Floating Label"
+				type="17001">
+			</mapping>
+   </diagramMappings>
+</extension>
+
 
     <extension
             point="org.eclipse.papyrus.infra.gmfdiag.canonical.strategies">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConnectionPointReferenceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConnectionPointReferenceEditPart.java
index 19e432c25be..76b8eb56407 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConnectionPointReferenceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConnectionPointReferenceEditPart.java
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -152,7 +153,8 @@ public class ConnectionPointReferenceEditPart extends AbstractBorderEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/FinalStateEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/FinalStateEditPart.java
index 6cca00ed52b..b105a2f7af0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/FinalStateEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/FinalStateEditPart.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -148,7 +149,8 @@ public class FinalStateEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateChoiceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateChoiceEditPart.java
index e4def8c07e8..bf9fd17b535 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateChoiceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateChoiceEditPart.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -151,7 +152,8 @@ public class PseudostateChoiceEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateDeepHistoryEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateDeepHistoryEditPart.java
index fe907f2b630..7e39e51dcb8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateDeepHistoryEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateDeepHistoryEditPart.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -151,7 +152,8 @@ public class PseudostateDeepHistoryEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateEntryPointEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateEntryPointEditPart.java
index 65021742e37..a78401e54b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateEntryPointEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateEntryPointEditPart.java
@@ -31,6 +31,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -152,7 +153,8 @@ public class PseudostateEntryPointEditPart extends RoundedBorderNamedElementEdit
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateExitPointEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateExitPointEditPart.java
index e6229c99227..90911e192ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateExitPointEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateExitPointEditPart.java
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -154,7 +155,8 @@ public class PseudostateExitPointEditPart extends RoundedBorderNamedElementEditP
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateForkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateForkEditPart.java
index 3c65fe99431..58d3770615c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateForkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateForkEditPart.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -153,7 +154,8 @@ public class PseudostateForkEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateInitialEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateInitialEditPart.java
index f323a08130c..c064fa5ac3f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateInitialEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateInitialEditPart.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -151,7 +152,8 @@ public class PseudostateInitialEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJoinEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJoinEditPart.java
index 4289ce90289..7ce0ee8ac4c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJoinEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJoinEditPart.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -153,7 +154,8 @@ public class PseudostateJoinEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJunctionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJunctionEditPart.java
index 77465542e80..41fe688baf8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJunctionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJunctionEditPart.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -151,7 +152,8 @@ public class PseudostateJunctionEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateShallowHistoryEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateShallowHistoryEditPart.java
index 96e8e0dd77f..04d6463d445 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateShallowHistoryEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateShallowHistoryEditPart.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -151,7 +152,8 @@ public class PseudostateShallowHistoryEditPart extends RoundedCompartmentEditPar
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateTerminateEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateTerminateEditPart.java
index 4e8ba1ff1b2..65cc0fe5a2b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateTerminateEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateTerminateEditPart.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -151,7 +152,8 @@ public class PseudostateTerminateEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateEditPart.java
index c1959929f49..b06155c5dca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateEditPart.java
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -175,7 +176,8 @@ public class StateEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLPaletteFactory.java
index a4daede37d0..3601d543080 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLPaletteFactory.java
@@ -26,109 +26,105 @@ import org.eclipse.papyrus.uml.diagram.statemachine.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...)

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATENODESGROUP_REGION = "statemachine.createNodesGroup.region";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATENODESGROUP_STATE = "statemachine.createNodesGroup.state";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATENODESGROUP_INITIAL = "statemachine.createNodesGroup.initial";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATENODESGROUP_FINALSTATE = "statemachine.createNodesGroup.finalstate";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATENODESGROUP_SHALLOWHISTORY = "statemachine.createNodesGroup.shallowhistory";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATENODESGROUP_DEEPHISTORY = "statemachine.createNodesGroup.deephistory";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATENODESGROUP_FORK = "statemachine.createNodesGroup.fork";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATENODESGROUP_JOIN = "statemachine.createNodesGroup.join";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATENODESGROUP_CHOICE = "statemachine.createNodesGroup.choice";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATENODESGROUP_JUNCTION = "statemachine.createNodesGroup.junction";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATENODESGROUP_ENTRYPOINT = "statemachine.createNodesGroup.entrypoint";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATENODESGROUP_EXITPOINT = "statemachine.createNodesGroup.exitpoint";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATENODESGROUP_TERMINATE = "statemachine.createNodesGroup.terminate";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATENODESGROUP_CONNECTIONPOINTREFERENCE = "statemachine.createNodesGroup.connectionpointreference";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATENODESGROUP_COMMENT = "statemachine.createNodesGroup.comment";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATENODESGROUP_CONSTRAINT = "statemachine.createNodesGroup.constraint";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATEEDGESGROUP_TRANSITION = "statemachine.createEdgesGroup.transition";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATEEDGESGROUP_LINK = "statemachine.createEdgesGroup.link";//$NON-NLS-1$

 

 	/**

-	 * @generated

-	 */

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

+	* @generated

+	*/

+	private final static String STATEMACHINE_CREATEEDGESGROUP_CONTEXTLINK = "statemachine.createEdgesGroup.contextlink";//$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

 	public UMLPaletteFactory() {

-

 	}

 

 	/**

@@ -136,61 +132,61 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 */

 	@Override

 	public Tool createTool(String toolId) {

-		if (toolId.equals(CREATEREGIONCREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATENODESGROUP_REGION)) {

 			return createRegionCreationTool();

 		}

-		if (toolId.equals(CREATESTATECREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATENODESGROUP_STATE)) {

 			return createStateCreationTool();

 		}

-		if (toolId.equals(CREATEINITIALCREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATENODESGROUP_INITIAL)) {

 			return createInitialCreationTool();

 		}

-		if (toolId.equals(CREATEFINALSTATECREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATENODESGROUP_FINALSTATE)) {

 			return createFinalStateCreationTool();

 		}

-		if (toolId.equals(CREATESHALLOWHISTORYCREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATENODESGROUP_SHALLOWHISTORY)) {

 			return createShallowHistoryCreationTool();

 		}

-		if (toolId.equals(CREATEDEEPHISTORYCREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATENODESGROUP_DEEPHISTORY)) {

 			return createDeepHistoryCreationTool();

 		}

-		if (toolId.equals(CREATEFORKCREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATENODESGROUP_FORK)) {

 			return createForkCreationTool();

 		}

-		if (toolId.equals(CREATEJOINCREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATENODESGROUP_JOIN)) {

 			return createJoinCreationTool();

 		}

-		if (toolId.equals(CREATECHOICECREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATENODESGROUP_CHOICE)) {

 			return createChoiceCreationTool();

 		}

-		if (toolId.equals(CREATEJUNCTIONCREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATENODESGROUP_JUNCTION)) {

 			return createJunctionCreationTool();

 		}

-		if (toolId.equals(CREATEENTRYPOINTCREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATENODESGROUP_ENTRYPOINT)) {

 			return createEntryPointCreationTool();

 		}

-		if (toolId.equals(CREATEEXITPOINTCREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATENODESGROUP_EXITPOINT)) {

 			return createExitPointCreationTool();

 		}

-		if (toolId.equals(CREATETERMINATECREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATENODESGROUP_TERMINATE)) {

 			return createTerminateCreationTool();

 		}

-		if (toolId.equals(CREATECONNECTIONPOINTREFERENCECREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATENODESGROUP_CONNECTIONPOINTREFERENCE)) {

 			return createConnectionPointReferenceCreationTool();

 		}

-		if (toolId.equals(CREATESTATEMACHINECOMMENTCREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATENODESGROUP_COMMENT)) {

 			return createStateMachineCommentCreationTool();

 		}

-		if (toolId.equals(CREATECONSTRAINTCREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATENODESGROUP_CONSTRAINT)) {

 			return createConstraintCreationTool();

 		}

-		if (toolId.equals(CREATETRANSITIONCREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATEEDGESGROUP_TRANSITION)) {

 			return createTransitionCreationTool();

 		}

-		if (toolId.equals(CREATECOMMENTLINKCREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATEEDGESGROUP_LINK)) {

 			return createCommentlinkCreationTool();

 		}

-		if (toolId.equals(CREATECONTEXTLINK3CREATIONTOOL)) {

+		if(toolId.equals(STATEMACHINE_CREATEEDGESGROUP_CONTEXTLINK)) {

 			return createContextLink3CreationTool();

 		}

 		// default return: null

@@ -202,7 +198,6 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 */

 	@Override

 	public Object getTemplate(String templateId) {

-

 		// default return: null

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/CompactStateInvariantEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/CompactStateInvariantEditPartCN.java
index a6e7ad42eb3..b5a471f6c69 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/CompactStateInvariantEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/CompactStateInvariantEditPartCN.java
@@ -35,6 +35,7 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -145,7 +146,8 @@ public class CompactStateInvariantEditPartCN extends NodeEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullStateInvariantEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullStateInvariantEditPartCN.java
index 7e48ff3c144..cf52118a53c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullStateInvariantEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullStateInvariantEditPartCN.java
@@ -33,6 +33,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -143,7 +144,8 @@ public class FullStateInvariantEditPartCN extends NodeEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/MessageOccurrenceSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/MessageOccurrenceSpecificationEditPartCN.java
index 7ac5a368730..e81de730da5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/MessageOccurrenceSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/MessageOccurrenceSpecificationEditPartCN.java
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;
 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -146,7 +147,8 @@ public class MessageOccurrenceSpecificationEditPartCN extends NodeEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/OccurrenceSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/OccurrenceSpecificationEditPartCN.java
index 36054d5fb4e..3ca9a53a2fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/OccurrenceSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/OccurrenceSpecificationEditPartCN.java
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;
 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -146,7 +147,8 @@ public class OccurrenceSpecificationEditPartCN extends NodeEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java
index 5a9ca1ee041..669788b8977 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -148,7 +149,8 @@ public class ActorEditPartTN extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java
index 7b2e8dceb91..7636f323526 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -148,7 +149,8 @@ public class ActorInComponentEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java
index c8222b82722..98392ebe874 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -148,7 +149,8 @@ public class ActorInPackageEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java
index 5f63e8f47d2..8acc3745db9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -151,7 +152,8 @@ public class ComponentInPackageEditPart extends SubjectNodeEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java
index 301afc8311f..d79433f3c54 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPo
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -145,7 +146,8 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierEditPartTN.java
index d1cafecbcf0..a437a3ce329 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierEditPartTN.java
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 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.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -151,7 +152,8 @@ public class SubjectClassifierEditPartTN extends SubjectNodeEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseEditPartTN.java
index e56e45f3988..954a625fc26 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseEditPartTN.java
@@ -35,6 +35,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -159,7 +160,8 @@ public class UseCaseEditPartTN extends UseCaseNodeEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentEditPart.java
index 5f99bc3eac6..ffdb495a4b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentEditPart.java
@@ -35,6 +35,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -159,7 +160,8 @@ public class UseCaseInComponentEditPart extends UseCaseNodeEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageEditPart.java
index 8175ac15824..715289590a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageEditPart.java
@@ -35,6 +35,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -159,7 +160,8 @@ public class UseCaseInPackageEditPart extends UseCaseNodeEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

+			if (false == notifier instanceof Edge

+					&& false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/DisplayedProfileElementLabelProvider.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/DisplayedProfileElementLabelProvider.java
index e2afcc2a3eb..e6229174d01 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/DisplayedProfileElementLabelProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/DisplayedProfileElementLabelProvider.java
@@ -37,6 +37,7 @@ import org.eclipse.papyrus.uml.profile.tree.objects.UnlimitedNaturalValueTreeObj
 import org.eclipse.papyrus.uml.profile.tree.objects.UserPrimitiveTypeValueTreeObject;
 import org.eclipse.papyrus.uml.profile.tree.objects.ValueTreeObject;
 import org.eclipse.papyrus.uml.profile.utils.Util;
+import org.eclipse.papyrus.uml.tools.utils.MultiplicityElementUtil;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Element;
@@ -371,24 +372,10 @@ public class DisplayedProfileElementLabelProvider extends LabelProvider {
 	 * @return the property short label
 	 */
 	private String getPropertyShortLabel(Property property) {
-
-		String label = "";
-
-		int upper = property.getUpper();
-		int lower = property.getLower();
-
 		Type type = property.getType();
-
 		String typeName = type.getName();
 		String name = property.getName();
-
-		if (upper != -1) {
-			label = name + ": " + typeName + " " + "[" + lower + ".." + upper + "]";
-		} else {
-			label = name + ": " + typeName + " " + "[" + lower + "..*]";
-		}
-
-		return label;
+		return name + ": " + typeName + " " + MultiplicityElementUtil.formatMultiplicity(property);
 	}
 
 	/**
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/ProfileElementLabelProvider.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/ProfileElementLabelProvider.java
index 04d96e42ef3..31865a62a49 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/ProfileElementLabelProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/ProfileElementLabelProvider.java
@@ -42,6 +42,7 @@ import org.eclipse.papyrus.uml.profile.tree.objects.UnlimitedNaturalValueTreeObj
 import org.eclipse.papyrus.uml.profile.tree.objects.UserPrimitiveTypeValueTreeObject;
 import org.eclipse.papyrus.uml.profile.tree.objects.ValueTreeObject;
 import org.eclipse.papyrus.uml.profile.utils.Util;
+import org.eclipse.papyrus.uml.tools.utils.MultiplicityElementUtil;
 import org.eclipse.papyrus.uml.tools.utils.ProfileUtil;
 import org.eclipse.papyrus.uml.tools.utils.TypeUtil;
 import org.eclipse.swt.graphics.Image;
@@ -358,28 +359,14 @@ public class ProfileElementLabelProvider extends LabelProvider {
 	 * @return the property short label
 	 */
 	private String getPropertyShortLabel(Property property) {
-
-		String label = "";
-
 		String derived = "";
 		if (property.isDerived()) {
 			derived = "/";
 		}
-		int upper = property.getUpper();
-		int lower = property.getLower();
-
 		Type type = property.getType();
-
 		String typeName = type == null ? TypeUtil.UNDEFINED_TYPE_NAME : type.getName();
 		String name = property.getName();
-
-		if (upper != -1) {
-			label = derived + name + ": " + typeName + " " + "[" + lower + ".." + upper + "]";
-		} else {
-			label = derived + name + ": " + typeName + " " + "[" + lower + "..*]";
-		}
-
-		return label;
+		return derived + name + ": " + typeName + " " + MultiplicityElementUtil.formatMultiplicity(property);
 	}
 
 	/**
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/Messages.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/Messages.java
index 3e71938faf4..b001182a853 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/Messages.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/Messages.java
@@ -132,6 +132,10 @@ public class Messages extends NLS {
 	public static String PapyrusSearchPage_49;
 
 	public static String PapyrusSearchPage_5;
+	
+	public static String PapyrusSearchPage_50;
+	
+	public static String PapyrusSearchPage_51;
 
 	public static String PapyrusSearchPage_6;
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/filters/TypesMatchFilter.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/filters/TypesMatchFilter.java
index f5eddbde6e7..741333fafb3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/filters/TypesMatchFilter.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/filters/TypesMatchFilter.java
@@ -1,88 +1,96 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.uml.search.ui.filters;

-

-import java.util.Arrays;

-import java.util.List;

-

-import org.eclipse.papyrus.uml.search.ui.Messages;

-import org.eclipse.papyrus.views.search.results.AbstractResultEntry;

-import org.eclipse.search.ui.text.Match;

-import org.eclipse.search.ui.text.MatchFilter;

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

-

-/**

- *

- * A specific kind of filter that can filter UML based results

- *

- */

-public class TypesMatchFilter extends MatchFilter {

-

-	private Object[] selectedTypes;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param types

-	 *            the collection of types whose instance are NOT filtered

-	 */

-	public TypesMatchFilter(Object[] types) {

-		this.selectedTypes = types;

-	}

-

-	@Override

-	public String getName() {

-		return Messages.TypesMatchFilter_0;

-	}

-

-	@Override

-	public String getID() {

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

-	}

-

-	@Override

-	public String getDescription() {

-		return Messages.TypesMatchFilter_2;

-	}

-

-	@Override

-	public String getActionLabel() {

-		return Messages.TypesMatchFilter_3;

-	}

-

-	@Override

-	public boolean filters(Match match) {

-		if (match instanceof AbstractResultEntry) {

-			List<Object> selectedTypesList = Arrays.asList(selectedTypes);

-

-			Object elementToValidate = ((AbstractResultEntry) match).elementToCheckFilterFor();

-

-			if (elementToValidate instanceof Element) {

-

-				if (selectedTypesList.contains(((Element) elementToValidate).eClass())) {

-					return false;

-				}

-				for (Object object : selectedTypesList) {

-					if (((Element) elementToValidate).getAppliedStereotypes().contains(object)) {

-						return false;

-					}

-				}

-				return true;

-			}

-		}

-

-		return false;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.search.ui.filters;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.uml.search.ui.Messages;
+import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
+import org.eclipse.papyrus.views.search.results.AbstractResultEntry;
+import org.eclipse.search.ui.text.Match;
+import org.eclipse.search.ui.text.MatchFilter;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Stereotype;
+
+/**
+ *
+ * A specific kind of filter that can filter UML based results
+ *
+ */
+public class TypesMatchFilter extends MatchFilter {
+
+	private Object[] selectedTypes;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param types
+	 *            the collection of types whose instance are NOT filtered
+	 */
+	public TypesMatchFilter(Object[] types) {
+		this.selectedTypes = types;
+	}
+
+	@Override
+	public String getName() {
+		return Messages.TypesMatchFilter_0;
+	}
+
+	@Override
+	public String getID() {
+		return "TypesMatchFilter"; //$NON-NLS-1$
+	}
+
+	@Override
+	public String getDescription() {
+		return Messages.TypesMatchFilter_2;
+	}
+
+	@Override
+	public String getActionLabel() {
+		return Messages.TypesMatchFilter_3;
+	}
+
+	@Override
+	public boolean filters(Match match) {
+		if (match instanceof AbstractResultEntry) {
+			List<Object> selectedTypesList = Arrays.asList(selectedTypes);
+
+			Object elementToValidate = ((AbstractResultEntry) match).elementToCheckFilterFor();
+
+			if (elementToValidate instanceof Element) {
+				if (selectedTypesList.contains(((Element) elementToValidate).eClass())) {
+					return false;
+				}
+				
+				for (Object selectedType : selectedTypesList) {
+					if (selectedType instanceof Stereotype) {
+						for (Stereotype appliedStereotype : ((Element) elementToValidate).getAppliedStereotypes()) {
+							if (EcoreUtil.getURI(appliedStereotype).equals(EcoreUtil.getURI((Stereotype) selectedType))) {
+								return false;
+							}
+						}
+					}
+				}
+				
+				return true;
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/messages.properties b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/messages.properties
index 4fefa1049a4..6aa3aaefabe 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/messages.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/messages.properties
@@ -13,12 +13,12 @@ PapyrusQuery_5=Failed to start ViewerSearcherService to find viewers in\:
 PapyrusQuery_6=Papyrus Search
 PapyrusSearchPage_0=Query expression is ill-formed
 PapyrusSearchPage_1=Query issue
-PapyrusSearchPage_10=Deselect All Elements
+PapyrusSearchPage_10=Deselect all UML types
 PapyrusSearchPage_11=Simple search
 PapyrusSearchPage_12=Advanced search
 PapyrusSearchPage_13=Enforce all and only selected stereotypes are applied
-PapyrusSearchPage_14=Select Subelements
-PapyrusSearchPage_15=Refresh lists
+PapyrusSearchPage_14=Select subtypes
+PapyrusSearchPage_15=Refresh by scope
 PapyrusSearchPage_16=Search only in name attribute
 PapyrusSearchPage_17=Search in all string attributes
 PapyrusSearchPage_18=Select context
@@ -50,17 +50,19 @@ PapyrusSearchPage_40=Error
 PapyrusSearchPage_41=You can replace only string attributes
 PapyrusSearchPage_42=Warning
 PapyrusSearchPage_43=Cannot perform replace action on OCL queries basis.
-PapyrusSearchPage_44=UML Elements
-PapyrusSearchPage_45=Stereotypes applied in model(s)
-PapyrusSearchPage_46=Select All Stereotypes
-PapyrusSearchPage_47=Deselect All Stereotypes
+PapyrusSearchPage_44=UML types
+PapyrusSearchPage_45=Stereotypes
+PapyrusSearchPage_46=Select all stereotypes
+PapyrusSearchPage_47=Deselect all stereotypes
 PapyrusSearchPage_48=String (leave empty in advanced search mode to search for element types only)
 PapyrusSearchPage_49=Enforce at least one stereotype is applied
 PapyrusSearchPage_5=Case sensitive
+PapyrusSearchPage_50=Only applied stereotypes
+PapyrusSearchPage_51=Profiles
 PapyrusSearchPage_6=Regular expression
 PapyrusSearchPage_7=Search kind:
 PapyrusSearchPage_8=Search for
-PapyrusSearchPage_9=Select All Elements
+PapyrusSearchPage_9=Select all UML types
 PapyrusSearchPage_btnCheckButton_text=Check Button
 PapyrusSearchPage_btnGg_text=gg
 PapyrusSearchPage_btnNewButton_text=New Button
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 9faa42cbe16..04c0dcf192c 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
@@ -21,7 +21,11 @@ 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.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.regex.PatternSyntaxException;
 
@@ -34,18 +38,25 @@ import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.impl.EClassImpl;
 import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.jface.dialogs.DialogPage;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTreeViewer;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.ICheckStateProvider;
 import org.eclipse.jface.viewers.ICheckable;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.ocl.examples.xtext.console.xtfo.EmbeddedXtextEditor;
 import org.eclipse.ocl.pivot.ExpressionInOCL;
@@ -121,6 +132,7 @@ import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Enumeration;
 import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Profile;
 import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.Stereotype;
 import org.eclipse.uml2.uml.UMLPackage;
@@ -139,12 +151,26 @@ import com.google.inject.Injector;
  *
  */
 public class PapyrusSearchPage extends DialogPage implements ISearchPage, IReplacePage {
+	
+	private int currentScope = -1;
 
-	private HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> participantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>();
+	private HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> umlTypeParticipantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>();
 
 	private HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> stereotypeParticipantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>();
-
+	
+	private LinkedList<Object> profiles = new LinkedList<Object>();
+	
+	private String allProfiles = "*";
+	
 	private Collection<Stereotype> availableStereotypes;
+	
+	private Collection<Stereotype> appliedStereotypes;
+	
+	private boolean profilesComputed = false;
+	
+	private boolean availableStereotypesComputed = false;
+	
+	private boolean appliedStereotypesComputed = false;
 
 	private static final String REGULAR_EXPRESSION_ILLFORMED = Messages.PapyrusSearchPage_0;
 
@@ -158,13 +184,15 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 	private ISearchPageContainer container;
 
-	private CheckBoxFilteredTree participantTypesTree;
+	private CheckBoxFilteredTree participantUMLTypesTree;
 
 	private CheckBoxFilteredTree participantStereotypesTree;
 	
-	private CheckboxTreeViewer participantTypesTreeViewer;
+	private CheckboxTreeViewer participantUMLTypesTreeViewer;
 	
 	private CheckboxTreeViewer participantStereotypesTreeViewer;
+	
+	private ComboViewer participantProfilesComboViewer;
 
 	private Label searchQueryExplanatoryLabel;
 
@@ -172,7 +200,6 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 	private Button btnCaseSensitive;
 
-
 	private Button btnSearchAllStringAttributes;
 
 	private Button btnSearchInName;
@@ -198,6 +225,12 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 	private int currentSearchKind = SIMPLE_SEARCH;
 	
 	private int currentQueryKind = TEXT_QUERY_KIND;
+	
+	private boolean onlyAppliedStereotypes = false;
+	
+	private boolean onlyAppliedStereotypesStateChanged = true;
+	
+	private Profile selectedProfile = null;
 
 	private ParserContext parserContext;
 
@@ -208,26 +241,22 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 	private Composite advancedSearchComposite;
 
 	private Composite textQueryFieldsComposite;
-
+	
+	private Button fBtnOnlyAppliedStereotypes;
+	
 	private Button fBtnSearchForAllSelected;
 	
 	private Button fBtnSearchForAnySelected;
 
-	private Label elementsLabel;
+	private Label umlTypesLabel;
 	
 	private Label stereotypesLabel;
 	
-	private Label emptyLabel;
+	private Label profilesLabel;
 	
-	private Label emptyLabel2;
-	
-	private Label emptyLabel3;
-	
-	private Label emptyLabel4;
-
-
-	protected void createSimpleSearchQueryField() {
+	private Label emptyLabel;
 
+	protected void createTextSearch() {
 		textQueryComposite = new Composite(queryComposite, SWT.NONE);
 		textQueryComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
 		textQueryComposite.setLayout(new GridLayout(2, false));
@@ -272,8 +301,6 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 			}
 		});
 
-
-
 		Group grpSearchFor = new Group(textQueryComposite, SWT.NONE);
 		grpSearchFor.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
 		grpSearchFor.setLayout(new GridLayout(1, false));
@@ -300,16 +327,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 						childControl.dispose();
 					}
 				
-					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
-					}*/
+					createSpecificTextSearch();
 					
 					advancedSearchComposite.layout();
 				}
@@ -323,19 +341,63 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 		if (currentSearchKind == ADVANCED_SEARCH) {
 			searchKind.select(ADVANCED_SEARCH);
-			participantsList.clear();
-			stereotypeParticipantsList.clear();
-			createResultList();
-			createAdvancedSearch();
-		} else if (currentSearchKind == SIMPLE_SEARCH) {
+		} else {
 			searchKind.select(SIMPLE_SEARCH);
-			simpleSearch();
+		}
+		createSpecificTextSearch();
+	}
+	
+	protected void createSpecificTextSearch() {
+		if (searchKind.getSelectionIndex() == ADVANCED_SEARCH) {
+			
+			if (container.getSelectedScope() == currentScope || currentScope == -1) { // if scope not changed or first time
+				if (umlTypeParticipantsList.isEmpty()) {
+					createUMLTypesList();
+				}
+
+				createProfilesList(false);
+				createStereotypesList(false);
+				
+				createAdvancedSearch(); // Don't call any methods of UI entities before this!
+				participantProfilesComboViewer.refresh();
+				participantUMLTypesTreeViewer.refresh();
+				filterParticipantStereotypesByProfile(); // This refreshes the participantStereotypesTreeViewer
+				
+				currentScope = container.getSelectedScope();
+			} else { // else: same code as refresh button except we need to recreate the UI
+				// Refresh UML types
+				if (umlTypeParticipantsList.isEmpty()) {
+					createUMLTypesList();
+				}
+				
+				// Refresh profiles
+				selectedProfile = null;
+				profilesComputed = false;
+				createProfilesList(true);
+				
+				// Refresh stereotypes
+				availableStereotypesComputed = false;
+				appliedStereotypesComputed = false;
+				createStereotypesList(true);
+								
+				// Refresh UI
+				createAdvancedSearch(); // Don't call any methods of UI entities before this!
+				participantProfilesComboViewer.refresh();
+				participantUMLTypesTreeViewer.refresh();
+				filterParticipantStereotypesByProfile(); // This refreshes the participantStereotypesTreeViewer
+				
+				currentScope = container.getSelectedScope();
+			}
+						
+			
+		} else {
+			createSimpleSearch();
 		}/* else {
 			Other search kinds in the future
 		}*/
 	}
 
-	protected void createResultList() {
+	protected void createUMLTypesList() {
 		ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
 		IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
 
@@ -350,33 +412,108 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 							for (EObject eAttribute : ((EClass) (parentElement).getElement()).getEAllAttributes()) {
 								ParticipantTypeAttribute attribute = new ParticipantTypeAttribute(eAttribute, (parentElement));
 								attributeList.add(attribute);
-
-
 							}
-							participantsList.put(parentElement, attributeList);
+							umlTypeParticipantsList.put(parentElement, attributeList);
 						}
 					}
 				}
+			}
+
+		};
+
+		try {
+			dialog.run(true, true, computeAvailableTypes);
+		} catch (InvocationTargetException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		} catch (InterruptedException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+
+	}
+	
+	protected void createProfilesList(boolean forceRefresh) {
+		if (forceRefresh || !profilesComputed) {
+			profiles.clear();
+			
+			ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
+			IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
+				public void run(IProgressMonitor thePM) throws InterruptedException {
+					Collection<Profile> appliedProfiles = StereotypeCollector.getInstance().computeAppliedProfiles(container);
+					profiles.add(allProfiles);
+					profiles.addAll(appliedProfiles);
+					profilesComputed = true;
+				}
+			};
+
+			try {
+				dialog.run(true, true, computeAvailableTypes);
 				
-				// Find available stereotypes
-				availableStereotypes = StereotypeCollector.getInstance().computeAppliedStereotypes(container);
-				for (Stereotype stereotype : availableStereotypes) {
-					ParticipantTypeElement parentElement = new ParticipantTypeElement(stereotype);
-					List<ParticipantTypeAttribute> attributeList = new ArrayList<ParticipantTypeAttribute>();
-					for (Property property : ((Stereotype) parentElement.getElement()).getAllAttributes()) {
-						if (!property.getName().startsWith("base_")) { //$NON-NLS-1$
-							if (property.getType() instanceof Element) {
-								ParticipantTypeAttribute attribute = new ParticipantTypeAttribute(property, parentElement);
-								attributeList.add(attribute);
+			} catch (InvocationTargetException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			} catch (InterruptedException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			}
+		}
+	}
+	
+	protected void createStereotypesList(final boolean forceRefresh) {
+		ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
+		IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
+
+			public void run(IProgressMonitor thePM) throws InterruptedException {
+				if (forceRefresh || onlyAppliedStereotypesStateChanged) {
+					stereotypeParticipantsList.clear();
+					
+					Collection<Stereotype> computedStereotypes;
+
+					// Find available stereotypes
+					if (onlyAppliedStereotypes) {
+						if (forceRefresh || !appliedStereotypesComputed) {
+							if (appliedStereotypes != null) {
+								appliedStereotypes.clear();
+							}
+							
+							appliedStereotypes = StereotypeCollector.getInstance().computeAppliedStereotypes(container);
+							appliedStereotypesComputed = true;
+						}
+
+						computedStereotypes = appliedStereotypes;
+					} else { // Find applied stereotypes
+						if (forceRefresh || !availableStereotypesComputed) {
+							if (availableStereotypes != null) {
+								availableStereotypes.clear();
 							}
+							
+							availableStereotypes = StereotypeCollector.getInstance().computeAvailableStereotypes(container);
+							availableStereotypesComputed = true;
 						}
 
+						computedStereotypes = availableStereotypes;
 					}
 
-					stereotypeParticipantsList.put(parentElement, attributeList);
+					// Fill the hash map for the treeviewer
+					for (Stereotype stereotype : computedStereotypes) {
+						ParticipantTypeElement parentElement = new ParticipantTypeElement(stereotype);
+						List<ParticipantTypeAttribute> attributeList = new ArrayList<ParticipantTypeAttribute>();
+						for (Property property : ((Stereotype) parentElement.getElement()).getAllAttributes()) {
+							if (!property.getName().startsWith("base_")) { //$NON-NLS-1$
+								if (property.getType() instanceof Element) {
+									ParticipantTypeAttribute attribute = new ParticipantTypeAttribute(property, parentElement);
+									attributeList.add(attribute);
+								}
+							}
+						}
+
+						stereotypeParticipantsList.put(parentElement, attributeList);
+					}
+					
+					onlyAppliedStereotypesStateChanged = false;
 				}
 			}
-
 		};
 
 		try {
@@ -388,28 +525,169 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
-
+	}
+	
+	protected void filterParticipantStereotypesByProfile() {
+		if (selectedProfile == null) {
+			participantStereotypesTreeViewer.setInput(stereotypeParticipantsList);
+			participantStereotypesTreeViewer.refresh();
+			return;
+		}
+		
+		HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> filteredStereotypeParticipantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>();		
+
+		Iterator<Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>> it = stereotypeParticipantsList.entrySet().iterator();
+		while (it.hasNext()) {
+			Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> pair = (Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>)it.next();
+			Stereotype stereotype = (Stereotype) ((ParticipantTypeElement) pair.getKey()).getElement();
+			if (EcoreUtil.getURI(stereotype.getProfile()).equals(EcoreUtil.getURI(selectedProfile))) {
+				filteredStereotypeParticipantsList.put(pair.getKey(), pair.getValue());
+			}
+		}
+		
+		participantStereotypesTreeViewer.setInput(filteredStereotypeParticipantsList);
+		participantStereotypesTreeViewer.refresh();
 	}
 
-	protected void createAdvancedSearch() {
-		elementsLabel = new Label(advancedSearchComposite, SWT.NONE);
-		elementsLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-		elementsLabel.setText(Messages.PapyrusSearchPage_44);
+	protected void createAdvancedSearch() {	
+		profilesLabel = new Label(advancedSearchComposite, SWT.NONE);
+		profilesLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		profilesLabel.setText(Messages.PapyrusSearchPage_51);
+		
+		//TODO Better solution than this empty label
+		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
+		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		emptyLabel.setText("");
+		
+		//TODO Better solution than this empty label
+		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
+		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		emptyLabel.setText("");
+		
+		// Newline
+		
+		participantProfilesComboViewer = new ComboViewer(advancedSearchComposite, SWT.READ_ONLY);
+		participantProfilesComboViewer.setContentProvider(ArrayContentProvider.getInstance());
+		participantProfilesComboViewer.setLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				if (element instanceof Profile) {
+					return ((Profile) element).getName();
+				}
+				return super.getText(element);
+			}
+		});
+		participantProfilesComboViewer.setSorter(new ViewerSorter());
+		participantProfilesComboViewer.setInput(profiles);
+		if (selectedProfile == null) {
+			participantProfilesComboViewer.setSelection(new StructuredSelection(allProfiles));
+		} else {
+			participantProfilesComboViewer.setSelection(new StructuredSelection(selectedProfile));
+		}
+		participantProfilesComboViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			public void selectionChanged(SelectionChangedEvent event) {
+				if (event.getSelection().isEmpty()) {
+					return;
+				}
+				
+				if (participantProfilesComboViewer.getStructuredSelection().getFirstElement() instanceof Profile) {
+					selectedProfile = (Profile) participantProfilesComboViewer.getStructuredSelection().getFirstElement();
+				} else {
+					selectedProfile = null;
+				}
+				
+				filterParticipantStereotypesByProfile();
+			}
+		});
+		
+		fBtnOnlyAppliedStereotypes = new Button(advancedSearchComposite, SWT.CHECK);
+		fBtnOnlyAppliedStereotypes.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
+		fBtnOnlyAppliedStereotypes.setText(Messages.PapyrusSearchPage_50);
+		fBtnOnlyAppliedStereotypes.setSelection(onlyAppliedStereotypes);
+		fBtnOnlyAppliedStereotypes.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				onlyAppliedStereotypes = fBtnOnlyAppliedStereotypes.getSelection();
+				
+				// Memorize previous stereotypes attributes that have been checked
+				HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> oldStereotypeParticipantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>();
+				Iterator<Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>> it = stereotypeParticipantsList.entrySet().iterator();
+				while (it.hasNext()) {
+					Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> pair = (Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>)it.next();
+					boolean toAdd = false;
+					if (pair.getKey().isChecked()) {
+						toAdd = true;
+					}
+					
+					if (!toAdd) {
+						for (ParticipantTypeAttribute attribute : pair.getValue()) {
+							if (attribute.isChecked()) {
+								toAdd = true;
+								break;
+							}
+						}
+					}
+					
+					if (toAdd) {
+						oldStereotypeParticipantsList.put(pair.getKey(), pair.getValue());
+					}
+				}
+				
+				onlyAppliedStereotypesStateChanged = true;
+				createStereotypesList(false);
+				
+				Iterator<Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>> it2 = oldStereotypeParticipantsList.entrySet().iterator();
+				while (it2.hasNext()) {
+					Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> oldPair = (Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>)it2.next();
+					Stereotype oldStereotype = (Stereotype) oldPair.getKey().getElement();
+					
+					Iterator<Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>> it3 = stereotypeParticipantsList.entrySet().iterator();
+					while (it3.hasNext()) {
+						Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> newPair = (Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>)it3.next();
+						Stereotype newStereotype = (Stereotype) newPair.getKey().getElement();
+						
+						// Lazy second condition because otherwise performance is impacted too much
+						if (EcoreUtil.getURI(newStereotype).equals(EcoreUtil.getURI(oldStereotype))
+								&& newPair.getValue().size() == oldPair.getValue().size()) {
+							newPair.getKey().setChecked(oldPair.getKey().isChecked());
+							for (int i = 0; i < oldPair.getValue().size(); i++) {
+								newPair.getValue().get(i).setChecked(oldPair.getValue().get(i).isChecked());
+							}
+						}
+					}
+				}
+				
+				filterParticipantStereotypesByProfile(); // This refreshes the list too
+			}
+		});
+		
+		//TODO Better solution than this empty label
+		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
+		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		emptyLabel.setText("");
+		
+		// Newline
+		
+		umlTypesLabel = new Label(advancedSearchComposite, SWT.NONE);
+		umlTypesLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		umlTypesLabel.setText(Messages.PapyrusSearchPage_44);
 		
 		stereotypesLabel = new Label(advancedSearchComposite, SWT.NONE);
 		stereotypesLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
 		stereotypesLabel.setText(Messages.PapyrusSearchPage_45);
 		
-		//TODO Better solution than this empty label to fill last row 1, col 3 with empty space
+		//TODO Better solution than this empty label
 		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
 		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
 		emptyLabel.setText("");
 		
-		participantTypesTree = new CheckBoxFilteredTree(advancedSearchComposite, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE, new PatternFilter(), true);
-		participantTypesTree.setLayout(new GridLayout());
+		// New line
+		
+		participantUMLTypesTree = new CheckBoxFilteredTree(advancedSearchComposite, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE, new PatternFilter(), true);
+		participantUMLTypesTree.setLayout(new GridLayout());
 		GridData typesChechboxTreeViewerGridData = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
 		typesChechboxTreeViewerGridData.heightHint = 150;
-		participantTypesTree.setLayoutData(typesChechboxTreeViewerGridData);
+		participantUMLTypesTree.setLayoutData(typesChechboxTreeViewerGridData);
 		
 		participantStereotypesTree = new CheckBoxFilteredTree(advancedSearchComposite, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE, new PatternFilter(), true);
 		participantStereotypesTree.setLayout(new GridLayout());
@@ -417,11 +695,11 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 		stereotypesChechboxTreeViewerGridData.heightHint = 150;
 		participantStereotypesTree.setLayoutData(stereotypesChechboxTreeViewerGridData);
 		
-		participantTypesTreeViewer = (CheckboxTreeViewer) participantTypesTree.getViewer();
-		participantTypesTreeViewer.setContentProvider(new ParticipantTypeContentProvider());
-		participantTypesTreeViewer.setLabelProvider(new ParticipantTypeLabelProvider());
-		participantTypesTreeViewer.setSorter(new ViewerSorter());
-		participantTypesTreeViewer.setCheckStateProvider(new ICheckStateProvider() {
+		participantUMLTypesTreeViewer = (CheckboxTreeViewer) participantUMLTypesTree.getViewer();
+		participantUMLTypesTreeViewer.setContentProvider(new ParticipantTypeContentProvider());
+		participantUMLTypesTreeViewer.setLabelProvider(new ParticipantTypeLabelProvider());
+		participantUMLTypesTreeViewer.setSorter(new ViewerSorter());
+		participantUMLTypesTreeViewer.setCheckStateProvider(new ICheckStateProvider() {
 
 			public boolean isGrayed(Object element) {
 				return false;
@@ -471,14 +749,14 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 			@Override
 			public void mouseUp(MouseEvent e) {
-				ISelection selection = participantTypesTreeViewer.getSelection();
+				ISelection selection = participantUMLTypesTreeViewer.getSelection();
 				if (selection instanceof IStructuredSelection) {
 					Object selectedElement = ((IStructuredSelection) selection).getFirstElement();
 
 					if (selectedElement instanceof ParticipantTypeElement) {
 						List<ParticipantTypeAttribute> attributeParentList = new ArrayList<ParticipantTypeAttribute>();
 
-						for (Object attribute : participantsList.get(selectedElement)) {
+						for (Object attribute : umlTypeParticipantsList.get(selectedElement)) {
 							if (attribute instanceof ParticipantTypeAttribute) {
 								if (((ParticipantTypeAttribute) attribute).isChecked()) {
 									attributeParentList.add(((ParticipantTypeAttribute) attribute));
@@ -498,7 +776,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 					}
 				}
 
-				participantTypesTreeViewer.refresh();
+				participantUMLTypesTreeViewer.refresh();
 			}
 		});
 
@@ -510,17 +788,17 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 			@Override
 			public void mouseUp(MouseEvent e) {
-				for (ParticipantTypeElement element : participantsList.keySet()) {
+				for (ParticipantTypeElement element : umlTypeParticipantsList.keySet()) {
 					if (!element.isChecked()) {
 						element.setChecked(true);
 
-						for (ParticipantTypeAttribute attribute : participantsList.get(element)) {
+						for (ParticipantTypeAttribute attribute : umlTypeParticipantsList.get(element)) {
 							attribute.setChecked(true);
 
 						}
 					}
 				}
-				participantTypesTreeViewer.refresh();
+				participantUMLTypesTreeViewer.refresh();
 
 			}
 		});
@@ -532,18 +810,18 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 			@Override
 			public void mouseUp(MouseEvent e) {
-				for (ParticipantTypeElement element : participantsList.keySet()) {
+				for (ParticipantTypeElement element : umlTypeParticipantsList.keySet()) {
 					if (element.isChecked()) {
 						element.setChecked(false);
 
-						for (ParticipantTypeAttribute attribute : participantsList.get(element)) {
+						for (ParticipantTypeAttribute attribute : umlTypeParticipantsList.get(element)) {
 							attribute.setChecked(false);
 
 
 						}
 					}
 				}
-				participantTypesTreeViewer.refresh();
+				participantUMLTypesTreeViewer.refresh();
 			}
 		});
 		
@@ -597,41 +875,38 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 			@Override
 			public void mouseUp(MouseEvent e) {
-				participantsList.clear();
-				stereotypeParticipantsList.clear();
-				createResultList();
-
-				//createAdvancedSearch();
-
-				participantTypesTreeViewer.refresh();
-				participantStereotypesTreeViewer.refresh();
+				refreshByScope();
 			}
 		});
-
-		participantTypesTreeViewer.setInput(participantsList);
-		((ICheckable) participantTypesTreeViewer).addCheckStateListener(new ParticipantTypesTreeViewerCheckStateListener(participantTypesTreeViewer, participantsList));
+		
+		participantUMLTypesTreeViewer.setInput(umlTypeParticipantsList);
+		((ICheckable) participantUMLTypesTreeViewer).addCheckStateListener(new ParticipantTypesTreeViewerCheckStateListener(participantUMLTypesTreeViewer, umlTypeParticipantsList));
 		
 		participantStereotypesTreeViewer.setInput(stereotypeParticipantsList);
 		((ICheckable) participantStereotypesTreeViewer).addCheckStateListener(new ParticipantTypesTreeViewerCheckStateListener(participantStereotypesTreeViewer, stereotypeParticipantsList));
 
-		//TODO Better solution than this empty label to fill last row 1, col 3 with empty space
-		emptyLabel2 = new Label(advancedSearchComposite, SWT.NONE);
-		emptyLabel2.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-		emptyLabel2.setText("");
+		// New line
+		
+		//TODO Better solution than this empty label
+		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
+		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		emptyLabel.setText("");
 		
 		fBtnSearchForAllSelected = new Button(advancedSearchComposite, SWT.CHECK);
 		fBtnSearchForAllSelected.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
 		fBtnSearchForAllSelected.setText(Messages.PapyrusSearchPage_13);
 		
-		//TODO Better solution than this empty label to fill last row 1, col 3 with empty space
-		emptyLabel3 = new Label(advancedSearchComposite, SWT.NONE);
-		emptyLabel3.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-		emptyLabel3.setText("");
+		//TODO Better solution than this empty label
+		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
+		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		emptyLabel.setText("");
 		
-		//TODO Better solution than this empty label to fill last row 1, col 3 with empty space
-		emptyLabel4 = new Label(advancedSearchComposite, SWT.NONE);
-		emptyLabel4.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-		emptyLabel4.setText("");
+		// New line
+		
+		//TODO Better solution than this empty label
+		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
+		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		emptyLabel.setText("");
 		
 		fBtnSearchForAnySelected = new Button(advancedSearchComposite, SWT.CHECK);
 		fBtnSearchForAnySelected.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
@@ -640,6 +915,30 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 		currentSearchKind = ADVANCED_SEARCH;
 		currentQueryKind = TEXT_QUERY_KIND;
 	}
+	
+	protected void refreshByScope() {
+		// Refresh UML types
+		if (umlTypeParticipantsList.isEmpty()) {
+			createUMLTypesList();
+		}
+		
+		// Refresh profiles
+		selectedProfile = null;
+		profilesComputed = false;
+		createProfilesList(true);
+		
+		// Refresh stereotypes
+		availableStereotypesComputed = false;
+		appliedStereotypesComputed = false;
+		createStereotypesList(true);
+		
+		
+		// Refresh UI
+		participantProfilesComboViewer.setSelection(new StructuredSelection(allProfiles));
+		participantProfilesComboViewer.refresh();
+		participantUMLTypesTreeViewer.refresh();
+		filterParticipantStereotypesByProfile(); // This refreshes the participantStereotypesTreeViewer
+	}
 
 	protected void selectAllSubSter(final ParticipantTypeElement elementParent, final List<ParticipantTypeAttribute> attributeParentList) {
 
@@ -647,7 +946,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 		IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
 
 			public void run(IProgressMonitor thePM) throws InterruptedException {
-				for (Object element : participantsList.keySet()) {
+				for (Object element : umlTypeParticipantsList.keySet()) {
 					if (element instanceof ParticipantTypeElement) {
 						checkAllSubSter((ParticipantTypeElement) element, elementParent, attributeParentList);
 
@@ -681,7 +980,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 				// Proceed with attributes
 				for (ParticipantTypeAttribute attributeParent : attributeParentList) {
-					for (ParticipantTypeAttribute attributeToEvaluate : participantsList.get(element)) {
+					for (ParticipantTypeAttribute attributeToEvaluate : umlTypeParticipantsList.get(element)) {
 						if (attributeParent.getElement() == attributeToEvaluate.getElement()) {
 
 							attributeToEvaluate.setChecked(true);
@@ -701,7 +1000,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 		IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
 
 			public void run(IProgressMonitor thePM) throws InterruptedException {
-				for (Object element : participantsList.keySet()) {
+				for (Object element : umlTypeParticipantsList.keySet()) {
 					if (element instanceof ParticipantTypeElement) {
 						checkAllSubUML((ParticipantTypeElement) element, elementParent, attributeParentList);
 
@@ -735,25 +1034,18 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 				// Proceed with attributes
 				for (ParticipantTypeAttribute attributeParent : attributeParentList) {
-					for (ParticipantTypeAttribute attributeToEvaluate : participantsList.get(element)) {
+					for (ParticipantTypeAttribute attributeToEvaluate : umlTypeParticipantsList.get(element)) {
 						if (attributeParent.getElement() == attributeToEvaluate.getElement()) {
-
 							attributeToEvaluate.setChecked(true);
-
-
 						}
-
 					}
 				}
 			}
 		}
-
 	}
 
 
-	protected void simpleSearch() {
-
-
+	protected void createSimpleSearch() {
 		Composite participantManipualtionComposite = new Composite(advancedSearchComposite, SWT.NONE);
 		participantManipualtionComposite.setLayout(new GridLayout(1, false));
 		participantManipualtionComposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, true, 1, 1));
@@ -787,7 +1079,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 	}
 
 
-	protected void createOCLSearchQueryField(EObject root) {
+	protected void createOCLSearch(EObject root) {
 
 		Composite client = queryComposite;
 
@@ -917,7 +1209,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 					}
 
 					if (queryKind.getSelectionIndex() == TEXT_QUERY_KIND) {
-						createSimpleSearchQueryField();
+						createTextSearch();
 					} else {
 						if (container.getSelectedScope() == ISearchPageContainer.SELECTION_SCOPE) {
 
@@ -927,7 +1219,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 									try {
 										EObject root = ((UmlModel) currentScope.getModelSet().getModel(UmlModel.MODEL_ID)).lookupRoot();
-										createOCLSearchQueryField(root);
+										createOCLSearch(root);
 
 										if (contextObject instanceof NamedElement) {
 											oclContext.setText(((NamedElement) contextObject).getQualifiedName());
@@ -942,17 +1234,17 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 									}
 								} else {
 									MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_23, Messages.PapyrusSearchPage_24);
-									createSimpleSearchQueryField();
+									createTextSearch();
 									queryKind.select(TEXT_QUERY_KIND);
 								}
 							} else {
 								MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_25, Messages.PapyrusSearchPage_26);
-								createSimpleSearchQueryField();
+								createTextSearch();
 								queryKind.select(TEXT_QUERY_KIND);
 							}
 						} else {
 							MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_27, Messages.PapyrusSearchPage_28);
-							createSimpleSearchQueryField();
+							createTextSearch();
 							queryKind.select(TEXT_QUERY_KIND);
 						}
 					}
@@ -966,7 +1258,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 		queryComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
 		queryComposite.setLayout(new GridLayout(1, false));
 
-		createSimpleSearchQueryField();
+		createTextSearch();
 
 		setControl(parent);
 	}
@@ -1112,12 +1404,12 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 					List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<ParticipantTypeElement>();
 					
-					for (ParticipantTypeElement element : this.participantsList.keySet()) {
+					for (ParticipantTypeElement element : this.umlTypeParticipantsList.keySet()) {
 						if (element.isChecked()) {
 							participantsToEvaluate.add(element);
 							
 							if (searchQueryText.getText().length() > 0) {
-								for (ParticipantTypeAttribute attributesToEvaluate : participantsList.get(element)) {
+								for (ParticipantTypeAttribute attributesToEvaluate : umlTypeParticipantsList.get(element)) {
 									if (attributesToEvaluate.isChecked()) {
 										participantsToEvaluate.add(attributesToEvaluate);
 									}
@@ -1222,15 +1514,15 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 						query = CompositePapyrusQueryProvider.getInstance().createSimpleSearchQuery(info);
 					} else {
 						List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<ParticipantTypeElement>();
-						for (ParticipantTypeElement element : this.participantsList.keySet()) {
+						for (ParticipantTypeElement element : this.umlTypeParticipantsList.keySet()) {
 							if (element.isChecked()) {
 								participantsToEvaluate.add(element);
-								if (participantsList.get(element).size() == 0) {
+								if (umlTypeParticipantsList.get(element).size() == 0) {
 									MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_38, Messages.PapyrusSearchPage_39);
 									return false;
 
 								} else {
-									for (ParticipantTypeAttribute attributesToEvaluate : participantsList.get(element)) {
+									for (ParticipantTypeAttribute attributesToEvaluate : umlTypeParticipantsList.get(element)) {
 										if (attributesToEvaluate.isChecked()) {
 											participantsToEvaluate.add(attributesToEvaluate);
 											boolean canDoReplace = false;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/FilterTypeContentProvider.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/FilterTypeContentProvider.java
index 7d351c6fd12..cecef37f898 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/FilterTypeContentProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/FilterTypeContentProvider.java
@@ -1,76 +1,94 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.uml.search.ui.providers;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Set;

-

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

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

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

-import org.eclipse.papyrus.views.search.results.AbstractResultEntry;

-import org.eclipse.papyrus.views.search.utils.MatchUtils;

-import org.eclipse.search.ui.text.AbstractTextSearchResult;

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

-

-/**

- *

- * Content provider used by the filter dialog to list available types in a search result

- *

- */

-public class FilterTypeContentProvider implements ITreeContentProvider {

-

-	public void dispose() {

-

-	}

-

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-

-	}

-

-	public Object[] getElements(Object inputElement) {

-		Set<Object> results = new HashSet<Object>();

-

-		if (inputElement instanceof AbstractTextSearchResult) {

-

-			Collection<AbstractResultEntry> matches = MatchUtils.getMatches((AbstractTextSearchResult) inputElement, Element.class, false);

-

-			for (AbstractResultEntry match : matches) {

-

-				results.add(((EObject) match.elementToCheckFilterFor()).eClass());

-				results.addAll(((Element) match.elementToCheckFilterFor()).getAppliedStereotypes());

-

-			}

-		}

-

-		return results.toArray();

-	}

-

-	public Object[] getChildren(Object parentElement) {

-		Set<Object> results = new HashSet<Object>();

-

-		return results.toArray();

-	}

-

-	public Object getParent(Object element) {

-		return null;

-	}

-

-	public boolean hasChildren(Object element) {

-

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.search.ui.providers;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.views.search.results.AbstractResultEntry;
+import org.eclipse.papyrus.views.search.utils.MatchUtils;
+import org.eclipse.search.ui.text.AbstractTextSearchResult;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Stereotype;
+
+/**
+ *
+ * Content provider used by the filter dialog to list available types in a search result
+ *
+ */
+public class FilterTypeContentProvider implements ITreeContentProvider {
+
+	public void dispose() {
+
+	}
+
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+
+	}
+
+	public Object[] getElements(Object inputElement) {
+		Set<Object> results = new HashSet<Object>();
+
+		if (inputElement instanceof AbstractTextSearchResult) {
+			Collection<AbstractResultEntry> matches = MatchUtils.getMatches((AbstractTextSearchResult) inputElement, Element.class, false);
+			Set<Stereotype> stereotypesToAdd = new HashSet<Stereotype>();
+			
+			for (AbstractResultEntry match : matches) {
+				// Add meta-classes
+				results.add(((EObject) match.elementToCheckFilterFor()).eClass());
+				
+				// Add stereotypes
+				for (Stereotype appliedStereotype : ((Element) match.elementToCheckFilterFor()).getAppliedStereotypes()) {
+					boolean exists = false;
+
+					for (Stereotype existingStereotype : stereotypesToAdd) {
+						if (EcoreUtil.getURI(existingStereotype).equals(EcoreUtil.getURI(appliedStereotype))) {
+							exists = true;
+							break;
+						}
+					}
+					
+					if (!exists) {
+						stereotypesToAdd.add(appliedStereotype);
+					}
+				}
+			}
+			
+			results.addAll(stereotypesToAdd);
+		}
+
+		return results.toArray();
+	}
+
+	public Object[] getChildren(Object parentElement) {
+		Set<Object> results = new HashSet<Object>();
+
+		return results.toArray();
+	}
+
+	public Object getParent(Object element) {
+		return null;
+	}
+
+	public boolean hasChildren(Object element) {
+
+		return false;
+	}
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ParticipantTypeLabelProvider.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ParticipantTypeLabelProvider.java
index 7c9ccfc2887..33ee50e46e0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ParticipantTypeLabelProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ParticipantTypeLabelProvider.java
@@ -24,7 +24,10 @@ import org.eclipse.papyrus.uml.search.ui.Activator;
 import org.eclipse.papyrus.uml.search.ui.Messages;
 import org.eclipse.papyrus.uml.tools.utils.ImageUtil;
 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.uml2.uml.Stereotype;
 
 import com.swtdesigner.ResourceManager;
@@ -61,6 +64,10 @@ public class ParticipantTypeLabelProvider extends LabelProvider {
 						image = ImageUtil.getImageFromLocation(icon);
 					}
 					
+					if (image.getBounds().width != 16 || image.getBounds().height != 16) {
+						return resize(image, 16, 16);
+					}
+					
 					return image;
 				} else {
 					LabelProviderService service = new LabelProviderServiceImpl();
@@ -88,5 +95,24 @@ public class ParticipantTypeLabelProvider extends LabelProvider {
 		return ""; //$NON-NLS-1$
 		//
 	}
-
+	
+	private Image resize(Image image, int width, int height) {
+		double dpi = Display.getDefault().getDPI().x;
+		double scale = dpi/96;
+		int scaledWidth = (int) (width * scale);
+		int scaledHeight = (int) (height * scale);
+		
+		Image scaled = new Image(Display.getDefault(), scaledWidth, scaledHeight);
+		GC gc = new GC(scaled);
+		gc.setAntialias(SWT.ON);
+		gc.setInterpolation(SWT.HIGH);
+		gc.drawImage(image, 0, 0,
+				image.getBounds().width, image.getBounds().height,
+				0, 0, scaledWidth, scaledHeight);
+		gc.dispose();
+		
+		image.dispose();
+		
+		return scaled;
+	}
 }
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/WorkspaceQueryProvider.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/WorkspaceQueryProvider.java
index f9b70a3c475..33be6d704d0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/WorkspaceQueryProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/WorkspaceQueryProvider.java
@@ -21,14 +21,9 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.services.ServiceMultiException;
-import org.eclipse.papyrus.infra.core.services.ServiceNotFoundException;
 import org.eclipse.papyrus.views.search.scope.ScopeEntry;
 import org.eclipse.papyrus.views.search.utils.DefaultServiceRegistryTracker;
 import org.eclipse.papyrus.views.search.utils.IServiceRegistryTracker;
-import org.eclipse.papyrus.views.search.utils.ModelUtils;
 import org.eclipse.uml2.uml.UMLPackage;
 
 
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 75993baf24f..5412282fee9 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
@@ -61,7 +61,91 @@ public class StereotypeCollector implements IStereotypeCollector {
 		return StereotypeCollector.instance;
 	}
 
+	/**
+	 * Computes the list of applied profiles in the model(s)
+	 * 
+	 * @param container
+	 * @return
+	 */
+	public Collection<Profile> computeAppliedProfiles(ISearchPageContainer container) {
+		Set<Profile> profiles = new HashSet<Profile>();
+		Set<URI> umlResources = new HashSet<URI>();
+
+		if (container == null) {
+			umlResources.addAll(createWorkspaceScope());
+		} else {
+			switch (container.getSelectedScope()) {
+			case ISearchPageContainer.WORKSPACE_SCOPE: {
+				umlResources.addAll(createWorkspaceScope());
+				break;
+			}
+			case ISearchPageContainer.SELECTION_SCOPE: {
+				ISelection selection = container.getSelection();
+
+				if (!selection.isEmpty()) {
+					if (selection instanceof IStructuredSelection) {
+						umlResources.addAll(createSelectionScope((IStructuredSelection) selection));
+					} else {
+						// Do a workspace search instead
+						umlResources.addAll(createWorkspaceScope());
+					}
+				} else {
+					// Do a workspace search instead
+					umlResources.addAll(createWorkspaceScope());
+				}
+				break;
+			}
+			case ISearchPageContainer.SELECTED_PROJECTS_SCOPE: {
+				String[] projects = container.getSelectedProjectNames();
+				umlResources.addAll(createProjectsScope(projects));
+				break;
+			}
+			case ISearchPageContainer.WORKING_SET_SCOPE: {
+				IWorkingSet[] workingSets = container.getSelectedWorkingSets();
+				umlResources.addAll(createWorkingSetsScope(workingSets));
+				break;
+			}
+			default: {
+				break;
+			}
+			}
+		}
+
+		for (URI uri : umlResources) {
+			ModelSet resourceSet = new ModelSet();
+			Resource resource = resourceSet.getResource(uri, true);
+
+			TreeIterator<EObject> UMLResourceContentIterator = resource.getAllContents();
+			while (UMLResourceContentIterator.hasNext()) {
+				EObject umlElement = UMLResourceContentIterator.next();
+
+				if (umlElement instanceof ProfileApplication) {
+					boolean found = false;
+					Profile profileToProcess = ((ProfileApplication) umlElement).getAppliedProfile();
+					for (Profile alreadyAddedProfile : profiles) {
+						if (EcoreUtil.getURI(alreadyAddedProfile).equals(EcoreUtil.getURI(profileToProcess))) {
+							found = true;
+						}
+					}
+					
+					if (!found) {
+						profiles.add(profileToProcess);
+					}
+				}
+			}
+		}
+
+		return profiles;
+
+	}
 
+	/**
+	 * Computes the list of available stereotypes in profiles applied to the model(s)
+	 * @see org.eclipse.papyrus.uml.stereotypecollector.IStereotypeCollector#computeAvailableStereotypes(org.eclipse.search.ui.ISearchPageContainer)
+	 *
+	 * @param container
+	 * @return
+	 */
 	public Collection<Stereotype> computeAvailableStereotypes(ISearchPageContainer container) {
 		Set<Stereotype> preResult = new HashSet<Stereotype>();
 
@@ -122,8 +206,10 @@ public class StereotypeCollector implements IStereotypeCollector {
 					boolean found = false;
 					Profile profileToProcess = ((ProfileApplication) umlElement).getAppliedProfile();
 					for (Profile alreadyAddedProfile : profiles) {
-
-						if (EcoreUtil.equals(alreadyAddedProfile, profileToProcess)) {
+						
+						//if (EcoreUtil.equals(alreadyAddedProfile, profileToProcess)) {
+						if (EcoreUtil.getURI(alreadyAddedProfile).equals(EcoreUtil.getURI(profileToProcess))) {
+						
 							found = true;
 						}
 					}
@@ -144,8 +230,7 @@ public class StereotypeCollector implements IStereotypeCollector {
 					boolean found = false;
 					Stereotype stereotypeToProcess = (Stereotype) profileContent;
 					for (Stereotype alreadyAddedStereotype : preResult) {
-
-						if (EcoreUtil.equals(alreadyAddedStereotype, stereotypeToProcess)) {
+						if (EcoreUtil.getURI(alreadyAddedStereotype).equals(EcoreUtil.getURI(stereotypeToProcess))) {
 							found = true;
 						}
 					}
@@ -168,8 +253,7 @@ public class StereotypeCollector implements IStereotypeCollector {
 					boolean found = false;
 					Stereotype stereotypeToProcess = (Stereotype) parent;
 					for (Stereotype alreadyAddedStereotype : result) {
-
-						if (EcoreUtil.equals(alreadyAddedStereotype, stereotypeToProcess)) {
+						if (EcoreUtil.getURI(alreadyAddedStereotype).equals(EcoreUtil.getURI(stereotypeToProcess))) {
 							found = true;
 						}
 					}
@@ -186,6 +270,64 @@ public class StereotypeCollector implements IStereotypeCollector {
 		return result;
 
 	}
+	
+	/**
+	 * Computes the list of available stereotypes in the given collection of profiles
+	 * 
+	 * @param container
+	 * @param profiles
+	 * @return
+	 */
+	public Collection<Stereotype> computeAvailableStereotypes(ISearchPageContainer container, Collection<Profile> profiles) {
+		Set<Stereotype> preResult = new HashSet<Stereotype>();
+
+		for (Profile profile : profiles) {
+			TreeIterator<EObject> profileContentIterator = profile.eAllContents();
+
+			while (profileContentIterator.hasNext()) {
+				EObject profileContent = profileContentIterator.next();
+				if (profileContent instanceof Stereotype) {
+					boolean found = false;
+					Stereotype stereotypeToProcess = (Stereotype) profileContent;
+					for (Stereotype alreadyAddedStereotype : preResult) {
+						if (EcoreUtil.getURI(alreadyAddedStereotype).equals(EcoreUtil.getURI(stereotypeToProcess))) {
+							found = true;
+						}
+					}
+
+					if (!found) {
+						preResult.add(stereotypeToProcess);
+					}
+				}
+			}
+		}
+
+		Set<Stereotype> result = new HashSet<Stereotype>();
+		for (Stereotype stereo : preResult) {
+			result.add(stereo);
+			for (Classifier parent : stereo.getGenerals()) {
+				if (parent instanceof Stereotype) {
+					result.add((Stereotype) parent);
+
+					boolean found = false;
+					Stereotype stereotypeToProcess = (Stereotype) parent;
+					for (Stereotype alreadyAddedStereotype : result) {
+						if (EcoreUtil.getURI(alreadyAddedStereotype).equals(EcoreUtil.getURI(stereotypeToProcess))) {
+							found = true;
+						}
+					}
+
+					if (!found) {
+						result.add(stereotypeToProcess);
+					}
+
+				}
+			}
+
+		}
+
+		return result;
+	}
 
 	public Collection<Stereotype> computeAppliedStereotypes(ISearchPageContainer container) {
 		Set<URI> umlResources = new HashSet<URI>();
@@ -247,7 +389,8 @@ public class StereotypeCollector implements IStereotypeCollector {
 							boolean exists = false;
 
 							for (Stereotype existingStereotype : stereotypes) {
-								if (EcoreUtil.equals(existingStereotype, stereotype)) {
+								//if (EcoreUtil.equals(existingStereotype, stereotype)) {
+								if (EcoreUtil.getURI(existingStereotype).equals(EcoreUtil.getURI(stereotype))) {
 									exists = true;
 									break;
 								}
@@ -296,6 +439,128 @@ public class StereotypeCollector implements IStereotypeCollector {
 	}
 
 	/**
+	 * Computes applied stereotypes in the given profile
+	 * 
+	 * @param container
+	 * @param profile
+	 * @return stereotypes
+	 */
+	
+	public Collection<Stereotype> computeAppliedStereotypes(ISearchPageContainer container, Profile profile) {
+		if (profile == null) {
+			return computeAppliedStereotypes(container);
+		}
+		
+		Set<URI> umlResources = new HashSet<URI>();
+		Set<Stereotype> stereotypes = new HashSet<Stereotype>();
+
+		if (container == null) {
+			umlResources.addAll(createWorkspaceScope());
+
+		} else {
+			switch (container.getSelectedScope()) {
+			case ISearchPageContainer.WORKSPACE_SCOPE: {
+				umlResources.addAll(createWorkspaceScope());
+				break;
+			}
+			case ISearchPageContainer.SELECTION_SCOPE: {
+				ISelection selection = container.getSelection();
+
+				if (!selection.isEmpty()) {
+					if (selection instanceof IStructuredSelection) {
+						umlResources.addAll(createSelectionScope((IStructuredSelection) selection));
+					} else {
+						// Do a workspace search instead
+						umlResources.addAll(createWorkspaceScope());
+					}
+				} else {
+					// Do a workspace search instead
+					umlResources.addAll(createWorkspaceScope());
+				}
+				break;
+			}
+			case ISearchPageContainer.SELECTED_PROJECTS_SCOPE: {
+				String[] projects = container.getSelectedProjectNames();
+				umlResources.addAll(createProjectsScope(projects));
+				break;
+			}
+			case ISearchPageContainer.WORKING_SET_SCOPE: {
+				IWorkingSet[] workingSets = container.getSelectedWorkingSets();
+				umlResources.addAll(createWorkingSetsScope(workingSets));
+				break;
+			}
+			default: {
+				break;
+			}
+			}
+		}
+
+		for (URI uri : umlResources) {
+			ModelSet resourceSet = new ModelSet();
+			Resource resource = resourceSet.getResource(uri, true);
+			EList<EObject> contents = resource.getContents();
+
+			for (EObject content : contents) {
+				if (!(content instanceof Model)) {
+					Element umlElement = UMLUtil.getBaseElement(content);
+
+					if (umlElement instanceof Element) {
+						for (Stereotype stereotype : umlElement.getAppliedStereotypes()) {
+							if (EcoreUtil.getURI(stereotype.getProfile()).equals(EcoreUtil.getURI(profile))) {
+								boolean exists = false;
+
+								for (Stereotype existingStereotype : stereotypes) {
+									//if (EcoreUtil.equals(existingStereotype, stereotype)) {
+									if (EcoreUtil.getURI(existingStereotype).equals(EcoreUtil.getURI(stereotype))) {
+										exists = true;
+										break;
+									}
+								}
+								
+								if (!exists) {
+									stereotypes.add(stereotype);
+								}	
+							}
+						}
+					}
+				}
+
+				/**
+				 * Keep old version for performance comparison
+				 */
+				/*while (UMLResourceContentIterator.hasNext()) {
+				EObject umlElement = UMLResourceContentIterator.next();
+
+				if (umlElement instanceof Model) {
+					Model umlModel = (Model) umlElement;
+					EList<Element> elements = umlModel.allOwnedElements();
+
+					for (Element element : elements) {
+						if (element.getAppliedStereotypes() != null && !element.getAppliedStereotypes().isEmpty()) {
+							for (Stereotype stereotype : element.getAppliedStereotypes()) {
+								boolean exists = false;
+
+								for (Stereotype existingStereotype : stereotypes) {
+									if (EcoreUtil.equals(existingStereotype, stereotype)) {
+										exists = true;
+										break;
+									}
+								}
+
+								if (!exists) {
+									stereotypes.add(stereotype);									
+								}
+							}
+						}
+					}
+				}*/
+			}
+		}
+
+		return stereotypes;
+	}
+	
+	/**
 	 * Create a scope when the container is ISearchPageContainer.SELECTION_SCOPE
 	 *
 	 * @param selection
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ObjectFlowReorientCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ObjectFlowReorientCommand.java
index 638ee4d20d0..f90be80b1a5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ObjectFlowReorientCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ObjectFlowReorientCommand.java
@@ -62,7 +62,7 @@ public class ObjectFlowReorientCommand extends EditElementCommand {
 	 * </pre>

 	 */

 	public boolean canExecute() {

-		if(false == getElementToEdit() instanceof ControlFlow) {

+		if(false == getElementToEdit() instanceof ObjectFlow) {

 			return false;

 		}

 		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ComponentEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ComponentEditHelper.java
index a39b7f6a562..a221cd1a9e7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ComponentEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ComponentEditHelper.java
@@ -1,14 +1,14 @@
 /*****************************************************************************

  * 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:

- * 

+ *

  * 		Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

@@ -31,6 +31,14 @@ import org.eclipse.uml2.uml.UMLPackage;
  */

 public class ComponentEditHelper extends ElementEditHelper {

 

+	/**

+	 * Constructor.

+	 *

+	 */

+	public ComponentEditHelper() {

+		getDefaultContainmentFeatures().put(UMLPackage.eINSTANCE.getClassifier(), UMLPackage.eINSTANCE.getComponent_PackagedElement());

+	}

+

 	@Override

 	protected ICommand getCreateCommand(CreateElementRequest req) {

 

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.classpath
index e5fbd3dd27a..27bd7bdac7a 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.classpath
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.classpath
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

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

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

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

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

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.settings/org.eclipse.jdt.core.prefs
index 4d72ad12656..f08be2b06c4 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 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
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF
index 516388a21e7..7a1ae0a3c6a 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF
@@ -1,37 +1,39 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist,

- org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist.antlr,

- org.eclipse.papyrus.uml.textedit.message.xtext.ui.quickfix

-Bundle-ActivationPolicy: lazy

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.textedit.message.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.antlr.runtime,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

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

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

- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

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

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

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

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

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.1.0",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0"

-Bundle-Vendor: %providerName

-Bundle-Version: 1.1.0.qualifier

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.message.xtext.ui.in

- ternal.UmlMessageActivator

-Import-Package: org.apache.log4j

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.message.xtext.ui

- ;singleton:=true

-

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist,
+ org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist.antlr,
+ org.eclipse.papyrus.uml.textedit.message.xtext.ui.quickfix
+Bundle-ActivationPolicy: lazy
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.papyrus.uml.textedit.message.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.antlr.runtime,
+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",
+ org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
+ org.eclipse.uml2.uml;bundle-version="3.1.0",
+ org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
+ org.eclipse.core.expressions;bundle-version="3.4.200",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.apache.log4j;bundle-version="1.2.15",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0"
+Bundle-Vendor: %providerName
+Bundle-Version: 1.1.0.qualifier
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.message.xtext.ui.in
+ ternal.UmlMessageActivator
+Import-Package: org.apache.log4j
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.message.xtext.ui
+ ;singleton:=true
+
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.xml
index 5a6aa079954..9161a35b4a3 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.xml
@@ -228,6 +228,7 @@
    <extension
          point="org.eclipse.papyrus.extensionpoints.editors.DirectEditor">
       <DirectEditor
+            additionalConstraint="org.eclipse.papyrus.uml.textedit.message.xtext.ui.contributions.AdvancedMessageDirectEditorConstraint"
             contributor="CEA List"
             icon="icons/Diagram_Communication.gif"
             language="Advanced message editor"
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.xml_gen b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.xml_gen
index a279be27433..25b73e7124d 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.xml_gen
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.xml_gen
@@ -250,7 +250,9 @@
    <extension
          point="org.eclipse.xtext.builder.participant">
       <participant
-            class="org.eclipse.papyrus.uml.textedit.message.xtext.ui.UmlMessageExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant">
+            class="org.eclipse.papyrus.uml.textedit.message.xtext.ui.UmlMessageExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"
+            fileExtensions="umlmessage"
+            >
       </participant>
    </extension>
    <extension
@@ -277,6 +279,27 @@
 	        <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.uml.textedit.message.xtext.UmlMessage.OpenGeneratedCode"
+				style="push">
+					<visibleWhen checkEnabled="false">
+						<reference definitionId="org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessage.Editor.opened" />
+					</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.papyrus.uml.textedit.message.xtext.ui.UmlMessageExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"
+			commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">
+				<activeWhen>
+					<reference definitionId="org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessage.Editor.opened" />
+				</activeWhen>
+		</handler>
+	</extension>
 
 	<!-- Quick Outline -->
 	<extension
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/AbstractUmlMessageUiModule.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/AbstractUmlMessageUiModule.java
index 5b24d831972..9145fa62854 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/AbstractUmlMessageUiModule.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/AbstractUmlMessageUiModule.java
@@ -1,16 +1,16 @@
+
 /*
  * generated by Xtext
  */
 package org.eclipse.papyrus.uml.textedit.message.xtext.ui;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.xtext.ui.DefaultUiModule;
 
 /**
  * Manual modifications go to {org.eclipse.papyrus.uml.textedit.message.xtext.ui.UmlMessageUiModule}
  */
 @SuppressWarnings("all")
-public abstract class AbstractUmlMessageUiModule extends DefaultUiModule {
+public abstract class AbstractUmlMessageUiModule extends org.eclipse.xtext.ui.DefaultUiModule {
 
 	public AbstractUmlMessageUiModule(AbstractUIPlugin plugin) {
 		super(plugin);
@@ -61,7 +61,7 @@ public abstract class AbstractUmlMessageUiModule extends DefaultUiModule {
 
 	// 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))
+		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);
 	}
 
@@ -132,8 +132,8 @@ public abstract class AbstractUmlMessageUiModule extends DefaultUiModule {
 
 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
 	public void configureContentAssistLexerProvider(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist.antlr.internal.InternalUmlMessageLexer.class).toProvider(
-				org.eclipse.xtext.parser.antlr.LexerProvider.create(org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist.antlr.internal.InternalUmlMessageLexer.class));
+		binder.bind(org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist.antlr.internal.InternalUmlMessageLexer.class)
+				.toProvider(org.eclipse.xtext.parser.antlr.LexerProvider.create(org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist.antlr.internal.InternalUmlMessageLexer.class));
 	}
 
 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/AbstractUmlMessageProposalProvider.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/AbstractUmlMessageProposalProvider.java
index 27efa8e33c4..5616dcb3b0a 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/AbstractUmlMessageProposalProvider.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/AbstractUmlMessageProposalProvider.java
@@ -45,7 +45,7 @@ public class AbstractUmlMessageProposalProvider extends org.eclipse.papyrus.uml.
 		// subclasses may override
 	}
 
-	public void complete_nameRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void complete_NAME_RULE(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
 
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/UmlMessageParser.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/UmlMessageParser.java
index 9d59b9f47b6..0be3dbec7ed 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/UmlMessageParser.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/UmlMessageParser.java
@@ -35,6 +35,7 @@ public class UmlMessageParser extends AbstractContentAssistParser {
 		if (nameMappings == null) {
 			nameMappings = new HashMap<AbstractElement, String>() {
 				private static final long serialVersionUID = 1L;
+
 				{
 					put(grammarAccess.getRecurrenceRuleAccess().getAlternatives(), "rule__RecurrenceRule__Alternatives");
 					put(grammarAccess.getMessageRuleAccess().getGroup(), "rule__MessageRule__Group__0");
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g
index 4c975c3dd2d..e1ec839cf29 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalUmlMessage;
 
 options {
@@ -707,8 +707,8 @@ rule__MessageRule__NameAssignment_3
     }
 :
 (
-{ before(grammarAccess.getMessageRuleAccess().getNameNameRuleTerminalRuleCall_3_0()); }
-	RULE_NAMERULE{ after(grammarAccess.getMessageRuleAccess().getNameNameRuleTerminalRuleCall_3_0()); }
+{ before(grammarAccess.getMessageRuleAccess().getNameNAME_RULETerminalRuleCall_3_0()); }
+	RULE_NAME_RULE{ after(grammarAccess.getMessageRuleAccess().getNameNAME_RULETerminalRuleCall_3_0()); }
 )
 
 ;
@@ -762,9 +762,7 @@ finally {
 }
 
 
-RULE_NAMERULE : ('a'..'z'|'A'..'Z') ('a'..'z'|'A'..'Z'|'_'|'-'|'0'..'9'|'('|')')*;
-
-RULE_INTEGER_VALUE : (('0'|'1'..'9' ('_'? '0'..'9')*)|('0b'|'0B') '0'..'1' ('_'? '0'..'1')*|('0x'|'0X') ('0'..'9'|'a'..'f'|'A'..'F') ('_'? ('0'..'9'|'a'..'f'|'A'..'F'))*|'0' '_'? '0'..'7' ('_'? '0'..'7')*);
+RULE_NAME_RULE : ('a'..'z'|'A'..'Z') ('a'..'z'|'A'..'Z'|'_'|'-'|'0'..'9'|'('|')')*;
 
 RULE_ID : (('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*|'\'' ( options {greedy=false;} : . )*'\'');
 
@@ -776,6 +774,8 @@ RULE_SL_COMMENT : '//' ~(('\n'|'\r'|'@'))* ('\r'? '\n')?;
 
 RULE_INT : ('0'..'9')+;
 
+RULE_INTEGER_VALUE : (('0'|'1'..'9' ('_'? '0'..'9')*)|('0b'|'0B') '0'..'1' ('_'? '0'..'1')*|('0x'|'0X') ('0'..'9'|'a'..'f'|'A'..'F') ('_'? ('0'..'9'|'a'..'f'|'A'..'F'))*|'0' '_'? '0'..'7' ('_'? '0'..'7')*);
+
 RULE_WS : (' '|'\t'|'\r'|'\n')+;
 
 RULE_ANY_OTHER : .;
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.tokens b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.tokens
index 876193cd8a6..a6047fc21ea 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.tokens
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.tokens
@@ -1,19 +1,19 @@
-RULE_NAMERULE=5

-RULE_ID=7

-RULE_STRING=4

-T__16=16

-T__15=15

-T__17=17

-T__14=14

-T__13=13

-RULE_ANY_OTHER=12

-RULE_INT=6

-RULE_INTEGER_VALUE=8

-RULE_WS=11

-RULE_SL_COMMENT=10

-RULE_ML_COMMENT=9

-':'=13

-'['=16

-'*'=15

-'.'=14

-']'=17

+'*'=15
+'.'=14
+':'=13
+'['=16
+']'=17
+RULE_ANY_OTHER=12
+RULE_ID=7
+RULE_INT=6
+RULE_INTEGER_VALUE=10
+RULE_ML_COMMENT=8
+RULE_NAME_RULE=5
+RULE_SL_COMMENT=9
+RULE_STRING=4
+RULE_WS=11
+T__13=13
+T__14=14
+T__15=15
+T__16=16
+T__17=17
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessageLexer.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessageLexer.java
index ca2f2256d20..27bb0026ec2 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessageLexer.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessageLexer.java
@@ -1,1446 +1,1381 @@
-package org.eclipse.papyrus.uml.textedit.message.xtext.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 InternalUmlMessageLexer extends Lexer {

-	public static final int RULE_NAMERULE = 5;

-	public static final int RULE_ID = 7;

-	public static final int RULE_STRING = 4;

-	public static final int T__16 = 16;

-	public static final int T__15 = 15;

-	public static final int T__17 = 17;

-	public static final int T__14 = 14;

-	public static final int T__13 = 13;

-	public static final int RULE_ANY_OTHER = 12;

-	public static final int RULE_INT = 6;

-	public static final int RULE_INTEGER_VALUE = 8;

-	public static final int RULE_WS = 11;

-	public static final int RULE_SL_COMMENT = 10;

-	public static final int EOF = -1;

-	public static final int RULE_ML_COMMENT = 9;

-

-	// delegates

-	// delegators

-

-	public InternalUmlMessageLexer() {

-		;

-	}

-

-	public InternalUmlMessageLexer(CharStream input) {

-		this(input, new RecognizerSharedState());

-	}

-

-	public InternalUmlMessageLexer(CharStream input, RecognizerSharedState state) {

-		super(input, state);

-

-	}

-

-	@Override

-	public String getGrammarFileName() {

-		return "../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g";

-	}

-

-	// $ANTLR start "T__13"

-	public final void mT__13() throws RecognitionException {

-		try {

-			int _type = T__13;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:11:7: ( ':' )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:11:9: ':'

-			{

-				match(':');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__13"

-

-	// $ANTLR start "T__14"

-	public final void mT__14() throws RecognitionException {

-		try {

-			int _type = T__14;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:12:7: ( '.' )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:12:9: '.'

-			{

-				match('.');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__14"

-

-	// $ANTLR start "T__15"

-	public final void mT__15() throws RecognitionException {

-		try {

-			int _type = T__15;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:13:7: ( '*' )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:13:9: '*'

-			{

-				match('*');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__15"

-

-	// $ANTLR start "T__16"

-	public final void mT__16() throws RecognitionException {

-		try {

-			int _type = T__16;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:14:7: ( '[' )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:14:9: '['

-			{

-				match('[');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__16"

-

-	// $ANTLR start "T__17"

-	public final void mT__17() throws RecognitionException {

-		try {

-			int _type = T__17;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:15:7: ( ']' )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:15:9: ']'

-			{

-				match(']');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__17"

-

-	// $ANTLR start "RULE_NAMERULE"

-	public final void mRULE_NAMERULE() throws RecognitionException {

-		try {

-			int _type = RULE_NAMERULE;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:765:15: ( ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' ..

-			// '9' | '(' | ')' )* )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:765:17: ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' ..

-			// '9' | '(' | ')' )*

-			{

-				if ((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;

-				}

-

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:765:37: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' | '(' | ')' )*

-				loop1: do {

-					int alt1 = 2;

-					int LA1_0 = input.LA(1);

-

-					if (((LA1_0 >= '(' && LA1_0 <= ')') || LA1_0 == '-' || (LA1_0 >= '0' && LA1_0 <= '9') || (LA1_0 >= 'A' && LA1_0 <= 'Z') || LA1_0 == '_' || (LA1_0 >= 'a' && LA1_0 <= 'z'))) {

-						alt1 = 1;

-					}

-

-

-					switch (alt1) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:

-					{

-						if ((input.LA(1) >= '(' && input.LA(1) <= ')') || 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 loop1;

-					}

-				} while (true);

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_NAMERULE"

-

-	// $ANTLR start "RULE_INTEGER_VALUE"

-	public final void mRULE_INTEGER_VALUE() throws RecognitionException {

-		try {

-			int _type = RULE_INTEGER_VALUE;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:20: ( ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' ..

-			// '1' ( ( '_' )? '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:22: ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' .. '1'

-			// ( ( '_' )? '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:22: ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' ..

-				// '1' ( ( '_' )? '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* )

-				int alt14 = 4;

-				int LA14_0 = input.LA(1);

-

-				if ((LA14_0 == '0')) {

-					switch (input.LA(2)) {

-					case 'B':

-					case 'b': {

-						alt14 = 2;

-					}

-						break;

-					case 'X':

-					case 'x': {

-						alt14 = 3;

-					}

-						break;

-					case '0':

-					case '1':

-					case '2':

-					case '3':

-					case '4':

-					case '5':

-					case '6':

-					case '7':

-					case '_': {

-						alt14 = 4;

-					}

-						break;

-					default:

-						alt14 = 1;

-					}

-

-				}

-				else if (((LA14_0 >= '1' && LA14_0 <= '9'))) {

-					alt14 = 1;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 14, 0, input);

-

-					throw nvae;

-				}

-				switch (alt14) {

-				case 1:

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:23: ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* )

-				{

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:23: ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* )

-					int alt4 = 2;

-					int LA4_0 = input.LA(1);

-

-					if ((LA4_0 == '0')) {

-						alt4 = 1;

-					}

-					else if (((LA4_0 >= '1' && LA4_0 <= '9'))) {

-						alt4 = 2;

-					}

-					else {

-						NoViableAltException nvae =

-								new NoViableAltException("", 4, 0, input);

-

-						throw nvae;

-					}

-					switch (alt4) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:24: '0'

-					{

-						match('0');

-

-					}

-						break;

-					case 2:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:28: '1' .. '9' ( ( '_' )? '0' .. '9' )*

-					{

-						matchRange('1', '9');

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:37: ( ( '_' )? '0' .. '9' )*

-						loop3: do {

-							int alt3 = 2;

-							int LA3_0 = input.LA(1);

-

-							if (((LA3_0 >= '0' && LA3_0 <= '9') || LA3_0 == '_')) {

-								alt3 = 1;

-							}

-

-

-							switch (alt3) {

-							case 1:

-							// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:38: ( '_' )? '0' .. '9'

-							{

-								// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:38: ( '_' )?

-								int alt2 = 2;

-								int LA2_0 = input.LA(1);

-

-								if ((LA2_0 == '_')) {

-									alt2 = 1;

-								}

-								switch (alt2) {

-								case 1:

-								// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:38: '_'

-								{

-									match('_');

-

-								}

-									break;

-

-								}

-

-								matchRange('0', '9');

-

-							}

-								break;

-

-							default:

-								break loop3;

-							}

-						} while (true);

-

-

-					}

-						break;

-

-					}

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:55: ( '0b' | '0B' ) '0' .. '1' ( ( '_' )? '0' .. '1' )*

-				{

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:55: ( '0b' | '0B' )

-					int alt5 = 2;

-					int LA5_0 = input.LA(1);

-

-					if ((LA5_0 == '0')) {

-						int LA5_1 = input.LA(2);

-

-						if ((LA5_1 == 'b')) {

-							alt5 = 1;

-						}

-						else if ((LA5_1 == 'B')) {

-							alt5 = 2;

-						}

-						else {

-							NoViableAltException nvae =

-									new NoViableAltException("", 5, 1, input);

-

-							throw nvae;

-						}

-					}

-					else {

-						NoViableAltException nvae =

-								new NoViableAltException("", 5, 0, input);

-

-						throw nvae;

-					}

-					switch (alt5) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:56: '0b'

-					{

-						match("0b");

-

-

-					}

-						break;

-					case 2:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:61: '0B'

-					{

-						match("0B");

-

-

-					}

-						break;

-

-					}

-

-					matchRange('0', '1');

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:76: ( ( '_' )? '0' .. '1' )*

-					loop7: do {

-						int alt7 = 2;

-						int LA7_0 = input.LA(1);

-

-						if (((LA7_0 >= '0' && LA7_0 <= '1') || LA7_0 == '_')) {

-							alt7 = 1;

-						}

-

-

-						switch (alt7) {

-						case 1:

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:77: ( '_' )? '0' .. '1'

-						{

-							// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:77: ( '_' )?

-							int alt6 = 2;

-							int LA6_0 = input.LA(1);

-

-							if ((LA6_0 == '_')) {

-								alt6 = 1;

-							}

-							switch (alt6) {

-							case 1:

-							// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:77: '_'

-							{

-								match('_');

-

-							}

-								break;

-

-							}

-

-							matchRange('0', '1');

-

-						}

-							break;

-

-						default:

-							break loop7;

-						}

-					} while (true);

-

-

-				}

-					break;

-				case 3:

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:93: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? (

-				// '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )*

-				{

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:93: ( '0x' | '0X' )

-					int alt8 = 2;

-					int LA8_0 = input.LA(1);

-

-					if ((LA8_0 == '0')) {

-						int LA8_1 = input.LA(2);

-

-						if ((LA8_1 == 'x')) {

-							alt8 = 1;

-						}

-						else if ((LA8_1 == 'X')) {

-							alt8 = 2;

-						}

-						else {

-							NoViableAltException nvae =

-									new NoViableAltException("", 8, 1, input);

-

-							throw nvae;

-						}

-					}

-					else {

-						NoViableAltException nvae =

-								new NoViableAltException("", 8, 0, input);

-

-						throw nvae;

-					}

-					switch (alt8) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:94: '0x'

-					{

-						match("0x");

-

-

-					}

-						break;

-					case 2:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:99: '0X'

-					{

-						match("0X");

-

-

-					}

-						break;

-

-					}

-

-					if ((input.LA(1) >= '0' && input.LA(1) <= '9') || (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;

-					}

-

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:134: ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )*

-					loop10: do {

-						int alt10 = 2;

-						int LA10_0 = input.LA(1);

-

-						if (((LA10_0 >= '0' && LA10_0 <= '9') || (LA10_0 >= 'A' && LA10_0 <= 'F') || LA10_0 == '_' || (LA10_0 >= 'a' && LA10_0 <= 'f'))) {

-							alt10 = 1;

-						}

-

-

-						switch (alt10) {

-						case 1:

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:135: ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )

-						{

-							// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:135: ( '_' )?

-							int alt9 = 2;

-							int LA9_0 = input.LA(1);

-

-							if ((LA9_0 == '_')) {

-								alt9 = 1;

-							}

-							switch (alt9) {

-							case 1:

-							// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:135: '_'

-							{

-								match('_');

-

-							}

-								break;

-

-							}

-

-							if ((input.LA(1) >= '0' && input.LA(1) <= '9') || (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;

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop10;

-						}

-					} while (true);

-

-

-				}

-					break;

-				case 4:

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:171: '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )*

-				{

-					match('0');

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:175: ( '_' )?

-					int alt11 = 2;

-					int LA11_0 = input.LA(1);

-

-					if ((LA11_0 == '_')) {

-						alt11 = 1;

-					}

-					switch (alt11) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:175: '_'

-					{

-						match('_');

-

-					}

-						break;

-

-					}

-

-					matchRange('0', '7');

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:189: ( ( '_' )? '0' .. '7' )*

-					loop13: do {

-						int alt13 = 2;

-						int LA13_0 = input.LA(1);

-

-						if (((LA13_0 >= '0' && LA13_0 <= '7') || LA13_0 == '_')) {

-							alt13 = 1;

-						}

-

-

-						switch (alt13) {

-						case 1:

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:190: ( '_' )? '0' .. '7'

-						{

-							// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:190: ( '_' )?

-							int alt12 = 2;

-							int LA12_0 = input.LA(1);

-

-							if ((LA12_0 == '_')) {

-								alt12 = 1;

-							}

-							switch (alt12) {

-							case 1:

-							// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:190: '_'

-							{

-								match('_');

-

-							}

-								break;

-

-							}

-

-							matchRange('0', '7');

-

-						}

-							break;

-

-						default:

-							break loop13;

-						}

-					} while (true);

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_INTEGER_VALUE"

-

-	// $ANTLR start "RULE_ID"

-	public final void mRULE_ID() throws RecognitionException {

-		try {

-			int _type = RULE_ID;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:769:9: ( ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0'

-			// .. '9' )* | '\\'' ( options {greedy=false; } : . )* '\\'' ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:769:11: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' ..

-			// '9' )* | '\\'' ( options {greedy=false; } : . )* '\\'' )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:769:11: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' |

-				// '0' .. '9' )* | '\\'' ( options {greedy=false; } : . )* '\\'' )

-				int alt17 = 2;

-				int LA17_0 = input.LA(1);

-

-				if (((LA17_0 >= 'A' && LA17_0 <= 'Z') || LA17_0 == '_' || (LA17_0 >= 'a' && LA17_0 <= 'z'))) {

-					alt17 = 1;

-				}

-				else if ((LA17_0 == '\'')) {

-					alt17 = 2;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 17, 0, input);

-

-					throw nvae;

-				}

-				switch (alt17) {

-				case 1:

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:769:12: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0'

-				// .. '9' )*

-				{

-					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.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:769:36: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*

-					loop15: do {

-						int alt15 = 2;

-						int LA15_0 = input.LA(1);

-

-						if (((LA15_0 >= '0' && LA15_0 <= '9') || (LA15_0 >= 'A' && LA15_0 <= 'Z') || LA15_0 == '_' || (LA15_0 >= 'a' && LA15_0 <= 'z'))) {

-							alt15 = 1;

-						}

-

-

-						switch (alt15) {

-						case 1:

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:

-						{

-							if ((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 loop15;

-						}

-					} while (true);

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:769:70: '\\'' ( options {greedy=false; } : . )* '\\''

-				{

-					match('\'');

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:769:75: ( options {greedy=false; } : . )*

-					loop16: do {

-						int alt16 = 2;

-						int LA16_0 = input.LA(1);

-

-						if ((LA16_0 == '\'')) {

-							alt16 = 2;

-						}

-						else if (((LA16_0 >= '\u0000' && LA16_0 <= '&') || (LA16_0 >= '(' && LA16_0 <= '\uFFFF'))) {

-							alt16 = 1;

-						}

-

-

-						switch (alt16) {

-						case 1:

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:769:103: .

-						{

-							matchAny();

-

-						}

-							break;

-

-						default:

-							break loop16;

-						}

-					} while (true);

-

-					match('\'');

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			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.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:771:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~

-			// ( ( '\\\\' | '\"' ) ) )* '\"' )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:771:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ (

-			// ( '\\\\' | '\"' ) ) )* '\"'

-			{

-				match('\"');

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:771:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( (

-				// '\\\\' | '\"' ) ) )*

-				loop18: do {

-					int alt18 = 3;

-					int LA18_0 = input.LA(1);

-

-					if ((LA18_0 == '\\')) {

-						alt18 = 1;

-					}

-					else if (((LA18_0 >= '\u0000' && LA18_0 <= '!') || (LA18_0 >= '#' && LA18_0 <= '[') || (LA18_0 >= ']' && LA18_0 <= '\uFFFF'))) {

-						alt18 = 2;

-					}

-

-

-					switch (alt18) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:771:20: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )

-					{

-						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.consume();

-

-						}

-						else {

-							MismatchedSetException mse = new MismatchedSetException(null, input);

-							recover(mse);

-							throw mse;

-						}

-

-

-					}

-						break;

-					case 2:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:771:61: ~ ( ( '\\\\' | '\"' ) )

-					{

-						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 loop18;

-					}

-				} while (true);

-

-				match('\"');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_STRING"

-

-	// $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.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:773:17: ( '/*' ~ ( '@' ) ( options {greedy=false; } : . )* '*/' )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:773:19: '/*' ~ ( '@' ) ( options {greedy=false; } : . )* '*/'

-			{

-				match("/*");

-

-				if ((input.LA(1) >= '\u0000' && input.LA(1) <= '?') || (input.LA(1) >= 'A' && input.LA(1) <= '\uFFFF')) {

-					input.consume();

-

-				}

-				else {

-					MismatchedSetException mse = new MismatchedSetException(null, input);

-					recover(mse);

-					throw mse;

-				}

-

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:773:31: ( options {greedy=false; } : . )*

-				loop19: do {

-					int alt19 = 2;

-					int LA19_0 = input.LA(1);

-

-					if ((LA19_0 == '*')) {

-						int LA19_1 = input.LA(2);

-

-						if ((LA19_1 == '/')) {

-							alt19 = 2;

-						}

-						else if (((LA19_1 >= '\u0000' && LA19_1 <= '.') || (LA19_1 >= '0' && LA19_1 <= '\uFFFF'))) {

-							alt19 = 1;

-						}

-

-

-					}

-					else if (((LA19_0 >= '\u0000' && LA19_0 <= ')') || (LA19_0 >= '+' && LA19_0 <= '\uFFFF'))) {

-						alt19 = 1;

-					}

-

-

-					switch (alt19) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:773:59: .

-					{

-						matchAny();

-

-					}

-						break;

-

-					default:

-						break loop19;

-					}

-				} while (true);

-

-				match("*/");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_ML_COMMENT"

-

-	// $ANTLR start "RULE_SL_COMMENT"

-	public final void mRULE_SL_COMMENT() throws RecognitionException {

-		try {

-			int _type = RULE_SL_COMMENT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:775:17: ( '//' (~ ( ( '\\n' | '\\r' | '@' ) ) )* ( ( '\\r' )? '\\n' )? )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:775:19: '//' (~ ( ( '\\n' | '\\r' | '@' ) ) )* ( ( '\\r' )? '\\n' )?

-			{

-				match("//");

-

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:775:24: (~ ( ( '\\n' | '\\r' | '@' ) ) )*

-				loop20: do {

-					int alt20 = 2;

-					int LA20_0 = input.LA(1);

-

-					if (((LA20_0 >= '\u0000' && LA20_0 <= '\t') || (LA20_0 >= '\u000B' && LA20_0 <= '\f') || (LA20_0 >= '\u000E' && LA20_0 <= '?') || (LA20_0 >= 'A' && LA20_0 <= '\uFFFF'))) {

-						alt20 = 1;

-					}

-

-

-					switch (alt20) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:775:24: ~ ( ( '\\n' | '\\r' | '@' ) )

-					{

-						if ((input.LA(1) >= '\u0000' && input.LA(1) <= '\t') || (input.LA(1) >= '\u000B' && input.LA(1) <= '\f') || (input.LA(1) >= '\u000E' && input.LA(1) <= '?') || (input.LA(1) >= 'A' && input.LA(1) <= '\uFFFF')) {

-							input.consume();

-

-						}

-						else {

-							MismatchedSetException mse = new MismatchedSetException(null, input);

-							recover(mse);

-							throw mse;

-						}

-

-

-					}

-						break;

-

-					default:

-						break loop20;

-					}

-				} while (true);

-

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:775:44: ( ( '\\r' )? '\\n' )?

-				int alt22 = 2;

-				int LA22_0 = input.LA(1);

-

-				if ((LA22_0 == '\n' || LA22_0 == '\r')) {

-					alt22 = 1;

-				}

-				switch (alt22) {

-				case 1:

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:775:45: ( '\\r' )? '\\n'

-				{

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:775:45: ( '\\r' )?

-					int alt21 = 2;

-					int LA21_0 = input.LA(1);

-

-					if ((LA21_0 == '\r')) {

-						alt21 = 1;

-					}

-					switch (alt21) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:775:45: '\\r'

-					{

-						match('\r');

-

-					}

-						break;

-

-					}

-

-					match('\n');

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_SL_COMMENT"

-

-	// $ANTLR start "RULE_INT"

-	public final void mRULE_INT() throws RecognitionException {

-		try {

-			int _type = RULE_INT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:10: ( ( '0' .. '9' )+ )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:12: ( '0' .. '9' )+

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:12: ( '0' .. '9' )+

-				int cnt23 = 0;

-				loop23: do {

-					int alt23 = 2;

-					int LA23_0 = input.LA(1);

-

-					if (((LA23_0 >= '0' && LA23_0 <= '9'))) {

-						alt23 = 1;

-					}

-

-

-					switch (alt23) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:13: '0' .. '9'

-					{

-						matchRange('0', '9');

-

-					}

-						break;

-

-					default:

-						if (cnt23 >= 1) {

-							break loop23;

-						}

-						EarlyExitException eee =

-								new EarlyExitException(23, input);

-						throw eee;

-					}

-					cnt23++;

-				} while (true);

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_INT"

-

-	// $ANTLR start "RULE_WS"

-	public final void mRULE_WS() throws RecognitionException {

-		try {

-			int _type = RULE_WS;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:779:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:779:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:779:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

-				int cnt24 = 0;

-				loop24: do {

-					int alt24 = 2;

-					int LA24_0 = input.LA(1);

-

-					if (((LA24_0 >= '\t' && LA24_0 <= '\n') || LA24_0 == '\r' || LA24_0 == ' ')) {

-						alt24 = 1;

-					}

-

-

-					switch (alt24) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.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 (cnt24 >= 1) {

-							break loop24;

-						}

-						EarlyExitException eee =

-								new EarlyExitException(24, input);

-						throw eee;

-					}

-					cnt24++;

-				} 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.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:781:16: ( . )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:781:18: .

-			{

-				matchAny();

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_ANY_OTHER"

-

-	@Override

-	public void mTokens() throws RecognitionException {

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | RULE_NAMERULE | RULE_INTEGER_VALUE |

-		// RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_INT | RULE_WS | RULE_ANY_OTHER )

-		int alt25 = 14;

-		alt25 = dfa25.predict(input);

-		switch (alt25) {

-		case 1:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:10: T__13

-		{

-			mT__13();

-

-		}

-			break;

-		case 2:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:16: T__14

-		{

-			mT__14();

-

-		}

-			break;

-		case 3:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:22: T__15

-		{

-			mT__15();

-

-		}

-			break;

-		case 4:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:28: T__16

-		{

-			mT__16();

-

-		}

-			break;

-		case 5:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:34: T__17

-		{

-			mT__17();

-

-		}

-			break;

-		case 6:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:40: RULE_NAMERULE

-		{

-			mRULE_NAMERULE();

-

-		}

-			break;

-		case 7:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:54: RULE_INTEGER_VALUE

-		{

-			mRULE_INTEGER_VALUE();

-

-		}

-			break;

-		case 8:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:73: RULE_ID

-		{

-			mRULE_ID();

-

-		}

-			break;

-		case 9:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:81: RULE_STRING

-		{

-			mRULE_STRING();

-

-		}

-			break;

-		case 10:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:93: RULE_ML_COMMENT

-		{

-			mRULE_ML_COMMENT();

-

-		}

-			break;

-		case 11:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:109: RULE_SL_COMMENT

-		{

-			mRULE_SL_COMMENT();

-

-		}

-			break;

-		case 12:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:125: RULE_INT

-		{

-			mRULE_INT();

-

-		}

-			break;

-		case 13:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:134: RULE_WS

-		{

-			mRULE_WS();

-

-		}

-			break;

-		case 14:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:142: RULE_ANY_OTHER

-		{

-			mRULE_ANY_OTHER();

-

-		}

-			break;

-

-		}

-

-	}

-

-

-	protected DFA25 dfa25 = new DFA25(this);

-	static final String DFA25_eotS =

-			"\6\uffff\1\24\2\26\1\uffff\3\16\10\uffff\1\24\1\uffff\1\26\1\uffff" +

-					"\1\26\5\uffff\1\26";

-	static final String DFA25_eofS =

-			"\40\uffff";

-	static final String DFA25_minS =

-			"\1\0\5\uffff\3\60\1\uffff\2\0\1\52\10\uffff\1\60\1\uffff\1\60\1" +

-					"\uffff\1\60\5\uffff\1\60";

-	static final String DFA25_maxS =

-			"\1\uffff\5\uffff\1\172\2\71\1\uffff\2\uffff\1\57\10\uffff\1\172" +

-					"\1\uffff\1\71\1\uffff\1\71\5\uffff\1\71";

-	static final String DFA25_acceptS =

-			"\1\uffff\1\1\1\2\1\3\1\4\1\5\3\uffff\1\10\3\uffff\1\15\1\16\1\1" +

-					"\1\2\1\3\1\4\1\5\1\6\1\uffff\1\7\1\uffff\1\14\1\uffff\1\10\1\11" +

-					"\1\12\1\13\1\15\1\uffff";

-	static final String DFA25_specialS =

-			"\1\2\11\uffff\1\1\1\0\24\uffff}>";

-	static final String[] DFA25_transitionS = {

-			"\11\16\2\15\2\16\1\15\22\16\1\15\1\16\1\13\4\16\1\12\2\16\1" +

-					"\3\3\16\1\2\1\14\1\7\11\10\1\1\6\16\32\6\1\4\1\16\1\5\1\16\1" +

-					"\11\1\16\32\6\uff85\16",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25",

-			"\10\27\2\30",

-			"\12\31",

-			"",

-			"\0\32",

-			"\0\33",

-			"\1\34\4\uffff\1\35",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25",

-			"",

-			"\10\37\2\30",

-			"",

-			"\12\31",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"\10\37\2\30"

-	};

-

-	static final short[] DFA25_eot = DFA.unpackEncodedString(DFA25_eotS);

-	static final short[] DFA25_eof = DFA.unpackEncodedString(DFA25_eofS);

-	static final char[] DFA25_min = DFA.unpackEncodedStringToUnsignedChars(DFA25_minS);

-	static final char[] DFA25_max = DFA.unpackEncodedStringToUnsignedChars(DFA25_maxS);

-	static final short[] DFA25_accept = DFA.unpackEncodedString(DFA25_acceptS);

-	static final short[] DFA25_special = DFA.unpackEncodedString(DFA25_specialS);

-	static final short[][] DFA25_transition;

-

-	static {

-		int numStates = DFA25_transitionS.length;

-		DFA25_transition = new short[numStates][];

-		for (int i = 0; i < numStates; i++) {

-			DFA25_transition[i] = DFA.unpackEncodedString(DFA25_transitionS[i]);

-		}

-	}

-

-	class DFA25 extends DFA {

-

-		public DFA25(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 25;

-			this.eot = DFA25_eot;

-			this.eof = DFA25_eof;

-			this.min = DFA25_min;

-			this.max = DFA25_max;

-			this.accept = DFA25_accept;

-			this.special = DFA25_special;

-			this.transition = DFA25_transition;

-		}

-

-		@Override

-		public String getDescription() {

-			return "1:1: Tokens : ( T__13 | T__14 | T__15 | T__16 | T__17 | RULE_NAMERULE | RULE_INTEGER_VALUE | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_INT | 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 LA25_11 = input.LA(1);

-

-				s = -1;

-				if (((LA25_11 >= '\u0000' && LA25_11 <= '\uFFFF'))) {

-					s = 27;

-				} else {

-					s = 14;

-				}

-

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			case 1:

-				int LA25_10 = input.LA(1);

-

-				s = -1;

-				if (((LA25_10 >= '\u0000' && LA25_10 <= '\uFFFF'))) {

-					s = 26;

-				} else {

-					s = 14;

-				}

-

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			case 2:

-				int LA25_0 = input.LA(1);

-

-				s = -1;

-				if ((LA25_0 == ':')) {

-					s = 1;

-				}

-

-				else if ((LA25_0 == '.')) {

-					s = 2;

-				}

-

-				else if ((LA25_0 == '*')) {

-					s = 3;

-				}

-

-				else if ((LA25_0 == '[')) {

-					s = 4;

-				}

-

-				else if ((LA25_0 == ']')) {

-					s = 5;

-				}

-

-				else if (((LA25_0 >= 'A' && LA25_0 <= 'Z') || (LA25_0 >= 'a' && LA25_0 <= 'z'))) {

-					s = 6;

-				}

-

-				else if ((LA25_0 == '0')) {

-					s = 7;

-				}

-

-				else if (((LA25_0 >= '1' && LA25_0 <= '9'))) {

-					s = 8;

-				}

-

-				else if ((LA25_0 == '_')) {

-					s = 9;

-				}

-

-				else if ((LA25_0 == '\'')) {

-					s = 10;

-				}

-

-				else if ((LA25_0 == '\"')) {

-					s = 11;

-				}

-

-				else if ((LA25_0 == '/')) {

-					s = 12;

-				}

-

-				else if (((LA25_0 >= '\t' && LA25_0 <= '\n') || LA25_0 == '\r' || LA25_0 == ' ')) {

-					s = 13;

-				}

-

-				else if (((LA25_0 >= '\u0000' && LA25_0 <= '\b') || (LA25_0 >= '\u000B' && LA25_0 <= '\f') || (LA25_0 >= '\u000E' && LA25_0 <= '\u001F') || LA25_0 == '!' || (LA25_0 >= '#' && LA25_0 <= '&') || (LA25_0 >= '(' && LA25_0 <= ')')

-						|| (LA25_0 >= '+' && LA25_0 <= '-') || (LA25_0 >= ';' && LA25_0 <= '@') || LA25_0 == '\\' || LA25_0 == '^' || LA25_0 == '`' || (LA25_0 >= '{' && LA25_0 <= '\uFFFF'))) {

-					s = 14;

-				}

-

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			}

-			NoViableAltException nvae =

-					new NoViableAltException(getDescription(), 25, _s, input);

-			error(nvae);

-			throw nvae;

-		}

-	}

-

-

+package org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist.antlr.internal;
+
+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;
+// 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;
+
+@SuppressWarnings("all")
+public class InternalUmlMessageLexer extends Lexer {
+	public static final int RULE_ID = 7;
+	public static final int RULE_STRING = 4;
+	public static final int T__16 = 16;
+	public static final int T__15 = 15;
+	public static final int T__17 = 17;
+	public static final int T__14 = 14;
+	public static final int T__13 = 13;
+	public static final int RULE_ANY_OTHER = 12;
+	public static final int RULE_INT = 6;
+	public static final int RULE_INTEGER_VALUE = 10;
+	public static final int RULE_WS = 11;
+	public static final int RULE_SL_COMMENT = 9;
+	public static final int EOF = -1;
+	public static final int RULE_NAME_RULE = 5;
+	public static final int RULE_ML_COMMENT = 8;
+
+	// delegates
+	// delegators
+
+	public InternalUmlMessageLexer() {
+		;
+	}
+
+	public InternalUmlMessageLexer(CharStream input) {
+		this(input, new RecognizerSharedState());
+	}
+
+	public InternalUmlMessageLexer(CharStream input, RecognizerSharedState state) {
+		super(input, state);
+
+	}
+
+	@Override
+	public String getGrammarFileName() {
+		return "../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g";
+	}
+
+	// $ANTLR start "T__13"
+	public final void mT__13() throws RecognitionException {
+		try {
+			int _type = T__13;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:11:7: ( ':' )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:11:9: ':'
+			{
+				match(':');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__13"
+
+	// $ANTLR start "T__14"
+	public final void mT__14() throws RecognitionException {
+		try {
+			int _type = T__14;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:12:7: ( '.' )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:12:9: '.'
+			{
+				match('.');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__14"
+
+	// $ANTLR start "T__15"
+	public final void mT__15() throws RecognitionException {
+		try {
+			int _type = T__15;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:13:7: ( '*' )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:13:9: '*'
+			{
+				match('*');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__15"
+
+	// $ANTLR start "T__16"
+	public final void mT__16() throws RecognitionException {
+		try {
+			int _type = T__16;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:14:7: ( '[' )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:14:9: '['
+			{
+				match('[');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__16"
+
+	// $ANTLR start "T__17"
+	public final void mT__17() throws RecognitionException {
+		try {
+			int _type = T__17;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:15:7: ( ']' )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:15:9: ']'
+			{
+				match(']');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__17"
+
+	// $ANTLR start "RULE_NAME_RULE"
+	public final void mRULE_NAME_RULE() throws RecognitionException {
+		try {
+			int _type = RULE_NAME_RULE;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:765:16: ( ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' ..
+			// '9' | '(' | ')' )* )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:765:18: ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' ..
+			// '9' | '(' | ')' )*
+			{
+				if ((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;
+				}
+
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:765:38: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' | '(' | ')' )*
+				loop1: do {
+					int alt1 = 2;
+					int LA1_0 = input.LA(1);
+
+					if (((LA1_0 >= '(' && LA1_0 <= ')') || LA1_0 == '-' || (LA1_0 >= '0' && LA1_0 <= '9') || (LA1_0 >= 'A' && LA1_0 <= 'Z') || LA1_0 == '_' || (LA1_0 >= 'a' && LA1_0 <= 'z'))) {
+						alt1 = 1;
+					}
+
+
+					switch (alt1) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:
+					{
+						if ((input.LA(1) >= '(' && input.LA(1) <= ')') || 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 loop1;
+					}
+				} while (true);
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_NAME_RULE"
+
+	// $ANTLR start "RULE_ID"
+	public final void mRULE_ID() throws RecognitionException {
+		try {
+			int _type = RULE_ID;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:9: ( ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0'
+			// .. '9' )* | '\\'' ( options {greedy=false; } : . )* '\\'' ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:11: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' ..
+			// '9' )* | '\\'' ( options {greedy=false; } : . )* '\\'' )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:11: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' |
+				// '0' .. '9' )* | '\\'' ( options {greedy=false; } : . )* '\\'' )
+				int alt4 = 2;
+				int LA4_0 = input.LA(1);
+
+				if (((LA4_0 >= 'A' && LA4_0 <= 'Z') || LA4_0 == '_' || (LA4_0 >= 'a' && LA4_0 <= 'z'))) {
+					alt4 = 1;
+				} else if ((LA4_0 == '\'')) {
+					alt4 = 2;
+				} else {
+					NoViableAltException nvae = new NoViableAltException("", 4, 0, input);
+
+					throw nvae;
+				}
+				switch (alt4) {
+				case 1:
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:12: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' |
+					// '0' .. '9' )*
+				{
+					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.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:36: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+					loop2: do {
+						int alt2 = 2;
+						int LA2_0 = input.LA(1);
+
+						if (((LA2_0 >= '0' && LA2_0 <= '9') || (LA2_0 >= 'A' && LA2_0 <= 'Z') || LA2_0 == '_' || (LA2_0 >= 'a' && LA2_0 <= 'z'))) {
+							alt2 = 1;
+						}
+
+
+						switch (alt2) {
+						case 1:
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:
+						{
+							if ((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 loop2;
+						}
+					} while (true);
+
+
+				}
+					break;
+				case 2:
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:70: '\\'' ( options {greedy=false; } : . )* '\\''
+				{
+					match('\'');
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:75: ( options {greedy=false; } : . )*
+					loop3: do {
+						int alt3 = 2;
+						int LA3_0 = input.LA(1);
+
+						if ((LA3_0 == '\'')) {
+							alt3 = 2;
+						} else if (((LA3_0 >= '\u0000' && LA3_0 <= '&') || (LA3_0 >= '(' && LA3_0 <= '\uFFFF'))) {
+							alt3 = 1;
+						}
+
+
+						switch (alt3) {
+						case 1:
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:767:103: .
+						{
+							matchAny();
+
+						}
+							break;
+
+						default:
+							break loop3;
+						}
+					} while (true);
+
+					match('\'');
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			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.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:769:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~
+			// ( ( '\\\\' | '\"' ) ) )* '\"' )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:769:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ (
+			// ( '\\\\' | '\"' ) ) )* '\"'
+			{
+				match('\"');
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:769:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( (
+				// '\\\\' | '\"' ) ) )*
+				loop5: do {
+					int alt5 = 3;
+					int LA5_0 = input.LA(1);
+
+					if ((LA5_0 == '\\')) {
+						alt5 = 1;
+					} else if (((LA5_0 >= '\u0000' && LA5_0 <= '!') || (LA5_0 >= '#' && LA5_0 <= '[') || (LA5_0 >= ']' && LA5_0 <= '\uFFFF'))) {
+						alt5 = 2;
+					}
+
+
+					switch (alt5) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:769:20: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+					{
+						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.consume();
+
+						} else {
+							MismatchedSetException mse = new MismatchedSetException(null, input);
+							recover(mse);
+							throw mse;
+						}
+
+
+					}
+						break;
+					case 2:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:769:61: ~ ( ( '\\\\' | '\"' ) )
+					{
+						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 loop5;
+					}
+				} while (true);
+
+				match('\"');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_STRING"
+
+	// $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.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:771:17: ( '/*' ~ ( '@' ) ( options {greedy=false; } : . )* '*/' )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:771:19: '/*' ~ ( '@' ) ( options {greedy=false; } : . )* '*/'
+			{
+				match("/*");
+
+				if ((input.LA(1) >= '\u0000' && input.LA(1) <= '?') || (input.LA(1) >= 'A' && input.LA(1) <= '\uFFFF')) {
+					input.consume();
+
+				} else {
+					MismatchedSetException mse = new MismatchedSetException(null, input);
+					recover(mse);
+					throw mse;
+				}
+
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:771:31: ( options {greedy=false; } : . )*
+				loop6: do {
+					int alt6 = 2;
+					int LA6_0 = input.LA(1);
+
+					if ((LA6_0 == '*')) {
+						int LA6_1 = input.LA(2);
+
+						if ((LA6_1 == '/')) {
+							alt6 = 2;
+						} else if (((LA6_1 >= '\u0000' && LA6_1 <= '.') || (LA6_1 >= '0' && LA6_1 <= '\uFFFF'))) {
+							alt6 = 1;
+						}
+
+
+					} else if (((LA6_0 >= '\u0000' && LA6_0 <= ')') || (LA6_0 >= '+' && LA6_0 <= '\uFFFF'))) {
+						alt6 = 1;
+					}
+
+
+					switch (alt6) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:771:59: .
+					{
+						matchAny();
+
+					}
+						break;
+
+					default:
+						break loop6;
+					}
+				} while (true);
+
+				match("*/");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_ML_COMMENT"
+
+	// $ANTLR start "RULE_SL_COMMENT"
+	public final void mRULE_SL_COMMENT() throws RecognitionException {
+		try {
+			int _type = RULE_SL_COMMENT;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:773:17: ( '//' (~ ( ( '\\n' | '\\r' | '@' ) ) )* ( ( '\\r' )? '\\n' )? )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:773:19: '//' (~ ( ( '\\n' | '\\r' | '@' ) ) )* ( ( '\\r' )? '\\n' )?
+			{
+				match("//");
+
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:773:24: (~ ( ( '\\n' | '\\r' | '@' ) ) )*
+				loop7: do {
+					int alt7 = 2;
+					int LA7_0 = input.LA(1);
+
+					if (((LA7_0 >= '\u0000' && LA7_0 <= '\t') || (LA7_0 >= '\u000B' && LA7_0 <= '\f') || (LA7_0 >= '\u000E' && LA7_0 <= '?') || (LA7_0 >= 'A' && LA7_0 <= '\uFFFF'))) {
+						alt7 = 1;
+					}
+
+
+					switch (alt7) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:773:24: ~ ( ( '\\n' | '\\r' | '@' ) )
+					{
+						if ((input.LA(1) >= '\u0000' && input.LA(1) <= '\t') || (input.LA(1) >= '\u000B' && input.LA(1) <= '\f') || (input.LA(1) >= '\u000E' && input.LA(1) <= '?') || (input.LA(1) >= 'A' && input.LA(1) <= '\uFFFF')) {
+							input.consume();
+
+						} else {
+							MismatchedSetException mse = new MismatchedSetException(null, input);
+							recover(mse);
+							throw mse;
+						}
+
+
+					}
+						break;
+
+					default:
+						break loop7;
+					}
+				} while (true);
+
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:773:44: ( ( '\\r' )? '\\n' )?
+				int alt9 = 2;
+				int LA9_0 = input.LA(1);
+
+				if ((LA9_0 == '\n' || LA9_0 == '\r')) {
+					alt9 = 1;
+				}
+				switch (alt9) {
+				case 1:
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:773:45: ( '\\r' )? '\\n'
+				{
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:773:45: ( '\\r' )?
+					int alt8 = 2;
+					int LA8_0 = input.LA(1);
+
+					if ((LA8_0 == '\r')) {
+						alt8 = 1;
+					}
+					switch (alt8) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:773:45: '\\r'
+					{
+						match('\r');
+
+					}
+						break;
+
+					}
+
+					match('\n');
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_SL_COMMENT"
+
+	// $ANTLR start "RULE_INT"
+	public final void mRULE_INT() throws RecognitionException {
+		try {
+			int _type = RULE_INT;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:775:10: ( ( '0' .. '9' )+ )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:775:12: ( '0' .. '9' )+
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:775:12: ( '0' .. '9' )+
+				int cnt10 = 0;
+				loop10: do {
+					int alt10 = 2;
+					int LA10_0 = input.LA(1);
+
+					if (((LA10_0 >= '0' && LA10_0 <= '9'))) {
+						alt10 = 1;
+					}
+
+
+					switch (alt10) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:775:13: '0' .. '9'
+					{
+						matchRange('0', '9');
+
+					}
+						break;
+
+					default:
+						if (cnt10 >= 1) {
+							break loop10;
+						}
+						EarlyExitException eee = new EarlyExitException(10, input);
+						throw eee;
+					}
+					cnt10++;
+				} while (true);
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_INT"
+
+	// $ANTLR start "RULE_INTEGER_VALUE"
+	public final void mRULE_INTEGER_VALUE() throws RecognitionException {
+		try {
+			int _type = RULE_INTEGER_VALUE;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:20: ( ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' ..
+			// '1' ( ( '_' )? '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:22: ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' .. '1'
+			// ( ( '_' )? '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:22: ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' ..
+				// '1' ( ( '_' )? '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* )
+				int alt23 = 4;
+				int LA23_0 = input.LA(1);
+
+				if ((LA23_0 == '0')) {
+					switch (input.LA(2)) {
+					case 'B':
+					case 'b': {
+						alt23 = 2;
+					}
+						break;
+					case 'X':
+					case 'x': {
+						alt23 = 3;
+					}
+						break;
+					case '0':
+					case '1':
+					case '2':
+					case '3':
+					case '4':
+					case '5':
+					case '6':
+					case '7':
+					case '_': {
+						alt23 = 4;
+					}
+						break;
+					default:
+						alt23 = 1;
+					}
+
+				} else if (((LA23_0 >= '1' && LA23_0 <= '9'))) {
+					alt23 = 1;
+				} else {
+					NoViableAltException nvae = new NoViableAltException("", 23, 0, input);
+
+					throw nvae;
+				}
+				switch (alt23) {
+				case 1:
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:23: ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* )
+				{
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:23: ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* )
+					int alt13 = 2;
+					int LA13_0 = input.LA(1);
+
+					if ((LA13_0 == '0')) {
+						alt13 = 1;
+					} else if (((LA13_0 >= '1' && LA13_0 <= '9'))) {
+						alt13 = 2;
+					} else {
+						NoViableAltException nvae = new NoViableAltException("", 13, 0, input);
+
+						throw nvae;
+					}
+					switch (alt13) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:24: '0'
+					{
+						match('0');
+
+					}
+						break;
+					case 2:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:28: '1' .. '9' ( ( '_' )? '0' .. '9' )*
+					{
+						matchRange('1', '9');
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:37: ( ( '_' )? '0' .. '9' )*
+						loop12: do {
+							int alt12 = 2;
+							int LA12_0 = input.LA(1);
+
+							if (((LA12_0 >= '0' && LA12_0 <= '9') || LA12_0 == '_')) {
+								alt12 = 1;
+							}
+
+
+							switch (alt12) {
+							case 1:
+								// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:38: ( '_' )? '0' .. '9'
+							{
+								// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:38: ( '_' )?
+								int alt11 = 2;
+								int LA11_0 = input.LA(1);
+
+								if ((LA11_0 == '_')) {
+									alt11 = 1;
+								}
+								switch (alt11) {
+								case 1:
+									// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:38: '_'
+								{
+									match('_');
+
+								}
+									break;
+
+								}
+
+								matchRange('0', '9');
+
+							}
+								break;
+
+							default:
+								break loop12;
+							}
+						} while (true);
+
+
+					}
+						break;
+
+					}
+
+
+				}
+					break;
+				case 2:
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:55: ( '0b' | '0B' ) '0' .. '1' ( ( '_' )? '0' .. '1' )*
+				{
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:55: ( '0b' | '0B' )
+					int alt14 = 2;
+					int LA14_0 = input.LA(1);
+
+					if ((LA14_0 == '0')) {
+						int LA14_1 = input.LA(2);
+
+						if ((LA14_1 == 'b')) {
+							alt14 = 1;
+						} else if ((LA14_1 == 'B')) {
+							alt14 = 2;
+						} else {
+							NoViableAltException nvae = new NoViableAltException("", 14, 1, input);
+
+							throw nvae;
+						}
+					} else {
+						NoViableAltException nvae = new NoViableAltException("", 14, 0, input);
+
+						throw nvae;
+					}
+					switch (alt14) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:56: '0b'
+					{
+						match("0b");
+
+
+					}
+						break;
+					case 2:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:61: '0B'
+					{
+						match("0B");
+
+
+					}
+						break;
+
+					}
+
+					matchRange('0', '1');
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:76: ( ( '_' )? '0' .. '1' )*
+					loop16: do {
+						int alt16 = 2;
+						int LA16_0 = input.LA(1);
+
+						if (((LA16_0 >= '0' && LA16_0 <= '1') || LA16_0 == '_')) {
+							alt16 = 1;
+						}
+
+
+						switch (alt16) {
+						case 1:
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:77: ( '_' )? '0' .. '1'
+						{
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:77: ( '_' )?
+							int alt15 = 2;
+							int LA15_0 = input.LA(1);
+
+							if ((LA15_0 == '_')) {
+								alt15 = 1;
+							}
+							switch (alt15) {
+							case 1:
+								// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:77: '_'
+							{
+								match('_');
+
+							}
+								break;
+
+							}
+
+							matchRange('0', '1');
+
+						}
+							break;
+
+						default:
+							break loop16;
+						}
+					} while (true);
+
+
+				}
+					break;
+				case 3:
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:93: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )?
+					// ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )*
+				{
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:93: ( '0x' | '0X' )
+					int alt17 = 2;
+					int LA17_0 = input.LA(1);
+
+					if ((LA17_0 == '0')) {
+						int LA17_1 = input.LA(2);
+
+						if ((LA17_1 == 'x')) {
+							alt17 = 1;
+						} else if ((LA17_1 == 'X')) {
+							alt17 = 2;
+						} else {
+							NoViableAltException nvae = new NoViableAltException("", 17, 1, input);
+
+							throw nvae;
+						}
+					} else {
+						NoViableAltException nvae = new NoViableAltException("", 17, 0, input);
+
+						throw nvae;
+					}
+					switch (alt17) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:94: '0x'
+					{
+						match("0x");
+
+
+					}
+						break;
+					case 2:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:99: '0X'
+					{
+						match("0X");
+
+
+					}
+						break;
+
+					}
+
+					if ((input.LA(1) >= '0' && input.LA(1) <= '9') || (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;
+					}
+
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:134: ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )*
+					loop19: do {
+						int alt19 = 2;
+						int LA19_0 = input.LA(1);
+
+						if (((LA19_0 >= '0' && LA19_0 <= '9') || (LA19_0 >= 'A' && LA19_0 <= 'F') || LA19_0 == '_' || (LA19_0 >= 'a' && LA19_0 <= 'f'))) {
+							alt19 = 1;
+						}
+
+
+						switch (alt19) {
+						case 1:
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:135: ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
+						{
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:135: ( '_' )?
+							int alt18 = 2;
+							int LA18_0 = input.LA(1);
+
+							if ((LA18_0 == '_')) {
+								alt18 = 1;
+							}
+							switch (alt18) {
+							case 1:
+								// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:135: '_'
+							{
+								match('_');
+
+							}
+								break;
+
+							}
+
+							if ((input.LA(1) >= '0' && input.LA(1) <= '9') || (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;
+							}
+
+
+						}
+							break;
+
+						default:
+							break loop19;
+						}
+					} while (true);
+
+
+				}
+					break;
+				case 4:
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:171: '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )*
+				{
+					match('0');
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:175: ( '_' )?
+					int alt20 = 2;
+					int LA20_0 = input.LA(1);
+
+					if ((LA20_0 == '_')) {
+						alt20 = 1;
+					}
+					switch (alt20) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:175: '_'
+					{
+						match('_');
+
+					}
+						break;
+
+					}
+
+					matchRange('0', '7');
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:189: ( ( '_' )? '0' .. '7' )*
+					loop22: do {
+						int alt22 = 2;
+						int LA22_0 = input.LA(1);
+
+						if (((LA22_0 >= '0' && LA22_0 <= '7') || LA22_0 == '_')) {
+							alt22 = 1;
+						}
+
+
+						switch (alt22) {
+						case 1:
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:190: ( '_' )? '0' .. '7'
+						{
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:190: ( '_' )?
+							int alt21 = 2;
+							int LA21_0 = input.LA(1);
+
+							if ((LA21_0 == '_')) {
+								alt21 = 1;
+							}
+							switch (alt21) {
+							case 1:
+								// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:777:190: '_'
+							{
+								match('_');
+
+							}
+								break;
+
+							}
+
+							matchRange('0', '7');
+
+						}
+							break;
+
+						default:
+							break loop22;
+						}
+					} while (true);
+
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_INTEGER_VALUE"
+
+	// $ANTLR start "RULE_WS"
+	public final void mRULE_WS() throws RecognitionException {
+		try {
+			int _type = RULE_WS;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:779:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:779:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:779:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+				int cnt24 = 0;
+				loop24: do {
+					int alt24 = 2;
+					int LA24_0 = input.LA(1);
+
+					if (((LA24_0 >= '\t' && LA24_0 <= '\n') || LA24_0 == '\r' || LA24_0 == ' ')) {
+						alt24 = 1;
+					}
+
+
+					switch (alt24) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.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 (cnt24 >= 1) {
+							break loop24;
+						}
+						EarlyExitException eee = new EarlyExitException(24, input);
+						throw eee;
+					}
+					cnt24++;
+				} 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.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:781:16: ( . )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:781:18: .
+			{
+				matchAny();
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_ANY_OTHER"
+
+	@Override
+	public void mTokens() throws RecognitionException {
+		// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | RULE_NAME_RULE | RULE_ID | RULE_STRING |
+		// RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_INT | RULE_INTEGER_VALUE | RULE_WS | RULE_ANY_OTHER )
+		int alt25 = 14;
+		alt25 = dfa25.predict(input);
+		switch (alt25) {
+		case 1:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:10: T__13
+		{
+			mT__13();
+
+		}
+			break;
+		case 2:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:16: T__14
+		{
+			mT__14();
+
+		}
+			break;
+		case 3:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:22: T__15
+		{
+			mT__15();
+
+		}
+			break;
+		case 4:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:28: T__16
+		{
+			mT__16();
+
+		}
+			break;
+		case 5:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:34: T__17
+		{
+			mT__17();
+
+		}
+			break;
+		case 6:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:40: RULE_NAME_RULE
+		{
+			mRULE_NAME_RULE();
+
+		}
+			break;
+		case 7:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:55: RULE_ID
+		{
+			mRULE_ID();
+
+		}
+			break;
+		case 8:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:63: RULE_STRING
+		{
+			mRULE_STRING();
+
+		}
+			break;
+		case 9:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:75: RULE_ML_COMMENT
+		{
+			mRULE_ML_COMMENT();
+
+		}
+			break;
+		case 10:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:91: RULE_SL_COMMENT
+		{
+			mRULE_SL_COMMENT();
+
+		}
+			break;
+		case 11:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:107: RULE_INT
+		{
+			mRULE_INT();
+
+		}
+			break;
+		case 12:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:116: RULE_INTEGER_VALUE
+		{
+			mRULE_INTEGER_VALUE();
+
+		}
+			break;
+		case 13:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:135: RULE_WS
+		{
+			mRULE_WS();
+
+		}
+			break;
+		case 14:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:143: RULE_ANY_OTHER
+		{
+			mRULE_ANY_OTHER();
+
+		}
+			break;
+
+		}
+
+	}
+
+
+	protected DFA25 dfa25 = new DFA25(this);
+	static final String DFA25_eotS = "\6\uffff\1\25\1\uffff\3\16\2\33\7\uffff\1\25\7\uffff\2\33\1\uffff" + "\1\33";
+	static final String DFA25_eofS = "\40\uffff";
+	static final String DFA25_minS = "\1\0\5\uffff\1\60\1\uffff\2\0\1\52\2\60\7\uffff\1\60\7\uffff\2" + "\60\1\uffff\1\60";
+	static final String DFA25_maxS = "\1\uffff\5\uffff\1\172\1\uffff\2\uffff\1\57\1\170\1\137\7\uffff" + "\1\172\7\uffff\2\137\1\uffff\1\137";
+	static final String DFA25_acceptS = "\1\uffff\1\1\1\2\1\3\1\4\1\5\1\uffff\1\7\5\uffff\1\15\1\16\1\1" + "\1\2\1\3\1\4\1\5\1\uffff\1\6\1\7\1\10\1\11\1\12\1\14\1\13\2\uffff" + "\1\15\1\uffff";
+	static final String DFA25_specialS = "\1\2\7\uffff\1\1\1\0\26\uffff}>";
+	static final String[] DFA25_transitionS = {
+			"\11\16\2\15\2\16\1\15\22\16\1\15\1\16\1\11\4\16\1\10\2\16\1" + "\3\3\16\1\2\1\12\1\13\11\14\1\1\6\16\32\6\1\4\1\16\1\5\1\16" + "\1\7\1\16\32\6\uff85\16",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"\12\24\7\uffff\32\24\4\uffff\1\24\1\uffff\32\24",
+			"",
+			"\0\26",
+			"\0\27",
+			"\1\30\4\uffff\1\31",
+			"\10\34\12\uffff\1\32\25\uffff\1\32\6\uffff\1\32\2\uffff\1" + "\32\25\uffff\1\32",
+			"\12\35\45\uffff\1\32",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"\12\24\7\uffff\32\24\4\uffff\1\24\1\uffff\32\24",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"\10\37\47\uffff\1\32",
+			"\12\35\45\uffff\1\32",
+			"",
+			"\10\37\47\uffff\1\32" };
+
+	static final short[] DFA25_eot = DFA.unpackEncodedString(DFA25_eotS);
+	static final short[] DFA25_eof = DFA.unpackEncodedString(DFA25_eofS);
+	static final char[] DFA25_min = DFA.unpackEncodedStringToUnsignedChars(DFA25_minS);
+	static final char[] DFA25_max = DFA.unpackEncodedStringToUnsignedChars(DFA25_maxS);
+	static final short[] DFA25_accept = DFA.unpackEncodedString(DFA25_acceptS);
+	static final short[] DFA25_special = DFA.unpackEncodedString(DFA25_specialS);
+	static final short[][] DFA25_transition;
+
+	static {
+		int numStates = DFA25_transitionS.length;
+		DFA25_transition = new short[numStates][];
+		for (int i = 0; i < numStates; i++) {
+			DFA25_transition[i] = DFA.unpackEncodedString(DFA25_transitionS[i]);
+		}
+	}
+
+	class DFA25 extends DFA {
+
+		public DFA25(BaseRecognizer recognizer) {
+			this.recognizer = recognizer;
+			this.decisionNumber = 25;
+			this.eot = DFA25_eot;
+			this.eof = DFA25_eof;
+			this.min = DFA25_min;
+			this.max = DFA25_max;
+			this.accept = DFA25_accept;
+			this.special = DFA25_special;
+			this.transition = DFA25_transition;
+		}
+
+		@Override
+		public String getDescription() {
+			return "1:1: Tokens : ( T__13 | T__14 | T__15 | T__16 | T__17 | RULE_NAME_RULE | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_INT | RULE_INTEGER_VALUE | 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 LA25_9 = input.LA(1);
+
+				s = -1;
+				if (((LA25_9 >= '\u0000' && LA25_9 <= '\uFFFF'))) {
+					s = 23;
+				} else {
+					s = 14;
+				}
+
+				if (s >= 0) {
+					return s;
+				}
+				break;
+			case 1:
+				int LA25_8 = input.LA(1);
+
+				s = -1;
+				if (((LA25_8 >= '\u0000' && LA25_8 <= '\uFFFF'))) {
+					s = 22;
+				} else {
+					s = 14;
+				}
+
+				if (s >= 0) {
+					return s;
+				}
+				break;
+			case 2:
+				int LA25_0 = input.LA(1);
+
+				s = -1;
+				if ((LA25_0 == ':')) {
+					s = 1;
+				}
+
+				else if ((LA25_0 == '.')) {
+					s = 2;
+				}
+
+				else if ((LA25_0 == '*')) {
+					s = 3;
+				}
+
+				else if ((LA25_0 == '[')) {
+					s = 4;
+				}
+
+				else if ((LA25_0 == ']')) {
+					s = 5;
+				}
+
+				else if (((LA25_0 >= 'A' && LA25_0 <= 'Z') || (LA25_0 >= 'a' && LA25_0 <= 'z'))) {
+					s = 6;
+				}
+
+				else if ((LA25_0 == '_')) {
+					s = 7;
+				}
+
+				else if ((LA25_0 == '\'')) {
+					s = 8;
+				}
+
+				else if ((LA25_0 == '\"')) {
+					s = 9;
+				}
+
+				else if ((LA25_0 == '/')) {
+					s = 10;
+				}
+
+				else if ((LA25_0 == '0')) {
+					s = 11;
+				}
+
+				else if (((LA25_0 >= '1' && LA25_0 <= '9'))) {
+					s = 12;
+				}
+
+				else if (((LA25_0 >= '\t' && LA25_0 <= '\n') || LA25_0 == '\r' || LA25_0 == ' ')) {
+					s = 13;
+				}
+
+				else if (((LA25_0 >= '\u0000' && LA25_0 <= '\b') || (LA25_0 >= '\u000B' && LA25_0 <= '\f') || (LA25_0 >= '\u000E' && LA25_0 <= '\u001F') || LA25_0 == '!' || (LA25_0 >= '#' && LA25_0 <= '&') || (LA25_0 >= '(' && LA25_0 <= ')')
+						|| (LA25_0 >= '+' && LA25_0 <= '-') || (LA25_0 >= ';' && LA25_0 <= '@') || LA25_0 == '\\' || LA25_0 == '^' || LA25_0 == '`' || (LA25_0 >= '{' && LA25_0 <= '\uFFFF'))) {
+					s = 14;
+				}
+
+				if (s >= 0) {
+					return s;
+				}
+				break;
+			}
+			NoViableAltException nvae = new NoViableAltException(getDescription(), 25, _s, input);
+			error(nvae);
+			throw nvae;
+		}
+	}
+
+
 }
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessageParser.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessageParser.java
index 5a9c2f93c2f..661b72ecbca 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessageParser.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessageParser.java
@@ -1,1956 +1,1907 @@
-package org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist.antlr.internal;

-

-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.uml.textedit.message.xtext.services.UmlMessageGrammarAccess;

-import org.eclipse.xtext.Grammar;

-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;

-

-@SuppressWarnings("all")

-public class InternalUmlMessageParser extends AbstractInternalContentAssistParser {

-	public static final String[] tokenNames = new String[] {

-			"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_NAMERULE", "RULE_INT", "RULE_ID", "RULE_INTEGER_VALUE", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "':'", "'.'", "'*'", "'['", "']'"

-	};

-	public static final int RULE_NAMERULE = 5;

-	public static final int RULE_ID = 7;

-	public static final int RULE_STRING = 4;

-	public static final int T__16 = 16;

-	public static final int T__15 = 15;

-	public static final int T__17 = 17;

-	public static final int T__14 = 14;

-	public static final int T__13 = 13;

-	public static final int RULE_ANY_OTHER = 12;

-	public static final int RULE_INT = 6;

-	public static final int RULE_INTEGER_VALUE = 8;

-	public static final int RULE_WS = 11;

-	public static final int RULE_SL_COMMENT = 10;

-	public static final int EOF = -1;

-	public static final int RULE_ML_COMMENT = 9;

-

-	// delegates

-	// delegators

-

-

-	public InternalUmlMessageParser(TokenStream input) {

-		this(input, new RecognizerSharedState());

-	}

-

-	public InternalUmlMessageParser(TokenStream input, RecognizerSharedState state) {

-		super(input, state);

-

-	}

-

-

-	@Override

-	public String[] getTokenNames() {

-		return InternalUmlMessageParser.tokenNames;

-	}

-

-	@Override

-	public String getGrammarFileName() {

-		return "../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g";

-	}

-

-

-

-	private UmlMessageGrammarAccess grammarAccess;

-

-	public void setGrammarAccess(UmlMessageGrammarAccess grammarAccess) {

-		this.grammarAccess = grammarAccess;

-	}

-

-	@Override

-	protected Grammar getGrammar() {

-		return grammarAccess.getGrammar();

-	}

-

-	@Override

-	protected String getValueForTokenName(String tokenName) {

-		return tokenName;

-	}

-

-

-

-

-	// $ANTLR start "entryRuleMessageRule"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:60:1: entryRuleMessageRule : ruleMessageRule EOF ;

-	public final void entryRuleMessageRule() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:61:1: ( ruleMessageRule EOF )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:62:1: ruleMessageRule EOF

-			{

-				before(grammarAccess.getMessageRuleRule());

-				pushFollow(FOLLOW_ruleMessageRule_in_entryRuleMessageRule61);

-				ruleMessageRule();

-

-				state._fsp--;

-

-				after(grammarAccess.getMessageRuleRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleMessageRule68);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleMessageRule"

-

-

-	// $ANTLR start "ruleMessageRule"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:69:1: ruleMessageRule : ( ( rule__MessageRule__Group__0 ) ) ;

-	public final void ruleMessageRule() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:73:2: ( ( ( rule__MessageRule__Group__0 ) ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:74:1: ( ( rule__MessageRule__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:74:1: ( ( rule__MessageRule__Group__0 ) )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:75:1: ( rule__MessageRule__Group__0 )

-				{

-					before(grammarAccess.getMessageRuleAccess().getGroup());

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:76:1: ( rule__MessageRule__Group__0 )

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:76:2: rule__MessageRule__Group__0

-					{

-						pushFollow(FOLLOW_rule__MessageRule__Group__0_in_ruleMessageRule94);

-						rule__MessageRule__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getMessageRuleAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleMessageRule"

-

-

-	// $ANTLR start "entryRuleSequenceTermRule"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:88:1: entryRuleSequenceTermRule : ruleSequenceTermRule EOF ;

-	public final void entryRuleSequenceTermRule() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:89:1: ( ruleSequenceTermRule EOF )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:90:1: ruleSequenceTermRule EOF

-			{

-				before(grammarAccess.getSequenceTermRuleRule());

-				pushFollow(FOLLOW_ruleSequenceTermRule_in_entryRuleSequenceTermRule121);

-				ruleSequenceTermRule();

-

-				state._fsp--;

-

-				after(grammarAccess.getSequenceTermRuleRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleSequenceTermRule128);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleSequenceTermRule"

-

-

-	// $ANTLR start "ruleSequenceTermRule"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:97:1: ruleSequenceTermRule : ( ( rule__SequenceTermRule__Group__0 ) ) ;

-	public final void ruleSequenceTermRule() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:101:2: ( ( ( rule__SequenceTermRule__Group__0 ) ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:102:1: ( ( rule__SequenceTermRule__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:102:1: ( ( rule__SequenceTermRule__Group__0 ) )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:103:1: ( rule__SequenceTermRule__Group__0 )

-				{

-					before(grammarAccess.getSequenceTermRuleAccess().getGroup());

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:104:1: ( rule__SequenceTermRule__Group__0 )

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:104:2: rule__SequenceTermRule__Group__0

-					{

-						pushFollow(FOLLOW_rule__SequenceTermRule__Group__0_in_ruleSequenceTermRule154);

-						rule__SequenceTermRule__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getSequenceTermRuleAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleSequenceTermRule"

-

-

-	// $ANTLR start "entryRuleRecurrenceRule"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:116:1: entryRuleRecurrenceRule : ruleRecurrenceRule EOF ;

-	public final void entryRuleRecurrenceRule() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:117:1: ( ruleRecurrenceRule EOF )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:118:1: ruleRecurrenceRule EOF

-			{

-				before(grammarAccess.getRecurrenceRuleRule());

-				pushFollow(FOLLOW_ruleRecurrenceRule_in_entryRuleRecurrenceRule181);

-				ruleRecurrenceRule();

-

-				state._fsp--;

-

-				after(grammarAccess.getRecurrenceRuleRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleRecurrenceRule188);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleRecurrenceRule"

-

-

-	// $ANTLR start "ruleRecurrenceRule"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:125:1: ruleRecurrenceRule : ( ( rule__RecurrenceRule__Alternatives ) ) ;

-	public final void ruleRecurrenceRule() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:129:2: ( ( ( rule__RecurrenceRule__Alternatives ) ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:130:1: ( ( rule__RecurrenceRule__Alternatives ) )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:130:1: ( ( rule__RecurrenceRule__Alternatives ) )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:131:1: ( rule__RecurrenceRule__Alternatives )

-				{

-					before(grammarAccess.getRecurrenceRuleAccess().getAlternatives());

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:132:1: ( rule__RecurrenceRule__Alternatives )

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:132:2: rule__RecurrenceRule__Alternatives

-					{

-						pushFollow(FOLLOW_rule__RecurrenceRule__Alternatives_in_ruleRecurrenceRule214);

-						rule__RecurrenceRule__Alternatives();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getRecurrenceRuleAccess().getAlternatives());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleRecurrenceRule"

-

-

-	// $ANTLR start "rule__RecurrenceRule__Alternatives"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:144:1: rule__RecurrenceRule__Alternatives : ( ( ( rule__RecurrenceRule__Group_0__0 ) ) | ( (

-	// rule__RecurrenceRule__Group_1__0 ) ) );

-	public final void rule__RecurrenceRule__Alternatives() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:148:1: ( ( ( rule__RecurrenceRule__Group_0__0 ) ) | ( (

-			// rule__RecurrenceRule__Group_1__0 ) ) )

-			int alt1 = 2;

-			int LA1_0 = input.LA(1);

-

-			if ((LA1_0 == 15)) {

-				alt1 = 1;

-			}

-			else if ((LA1_0 == 16)) {

-				alt1 = 2;

-			}

-			else {

-				NoViableAltException nvae =

-						new NoViableAltException("", 1, 0, input);

-

-				throw nvae;

-			}

-			switch (alt1) {

-			case 1:

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:149:1: ( ( rule__RecurrenceRule__Group_0__0 ) )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:149:1: ( ( rule__RecurrenceRule__Group_0__0 ) )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:150:1: ( rule__RecurrenceRule__Group_0__0 )

-				{

-					before(grammarAccess.getRecurrenceRuleAccess().getGroup_0());

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:151:1: ( rule__RecurrenceRule__Group_0__0 )

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:151:2: rule__RecurrenceRule__Group_0__0

-					{

-						pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__0_in_rule__RecurrenceRule__Alternatives250);

-						rule__RecurrenceRule__Group_0__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getRecurrenceRuleAccess().getGroup_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:155:6: ( ( rule__RecurrenceRule__Group_1__0 ) )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:155:6: ( ( rule__RecurrenceRule__Group_1__0 ) )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:156:1: ( rule__RecurrenceRule__Group_1__0 )

-				{

-					before(grammarAccess.getRecurrenceRuleAccess().getGroup_1());

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:157:1: ( rule__RecurrenceRule__Group_1__0 )

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:157:2: rule__RecurrenceRule__Group_1__0

-					{

-						pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__0_in_rule__RecurrenceRule__Alternatives268);

-						rule__RecurrenceRule__Group_1__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getRecurrenceRuleAccess().getGroup_1());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__RecurrenceRule__Alternatives"

-

-

-	// $ANTLR start "rule__MessageRule__Group__0"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:168:1: rule__MessageRule__Group__0 : rule__MessageRule__Group__0__Impl

-	// rule__MessageRule__Group__1 ;

-	public final void rule__MessageRule__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:172:1: ( rule__MessageRule__Group__0__Impl rule__MessageRule__Group__1 )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:173:2: rule__MessageRule__Group__0__Impl rule__MessageRule__Group__1

-			{

-				pushFollow(FOLLOW_rule__MessageRule__Group__0__Impl_in_rule__MessageRule__Group__0299);

-				rule__MessageRule__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__MessageRule__Group__1_in_rule__MessageRule__Group__0302);

-				rule__MessageRule__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__MessageRule__Group__0"

-

-

-	// $ANTLR start "rule__MessageRule__Group__0__Impl"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:180:1: rule__MessageRule__Group__0__Impl : ( ( rule__MessageRule__SequenceTermAssignment_0 )

-	// ) ;

-	public final void rule__MessageRule__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:184:1: ( ( ( rule__MessageRule__SequenceTermAssignment_0 ) ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:185:1: ( ( rule__MessageRule__SequenceTermAssignment_0 ) )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:185:1: ( ( rule__MessageRule__SequenceTermAssignment_0 ) )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:186:1: ( rule__MessageRule__SequenceTermAssignment_0 )

-				{

-					before(grammarAccess.getMessageRuleAccess().getSequenceTermAssignment_0());

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:187:1: ( rule__MessageRule__SequenceTermAssignment_0 )

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:187:2: rule__MessageRule__SequenceTermAssignment_0

-					{

-						pushFollow(FOLLOW_rule__MessageRule__SequenceTermAssignment_0_in_rule__MessageRule__Group__0__Impl329);

-						rule__MessageRule__SequenceTermAssignment_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getMessageRuleAccess().getSequenceTermAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__MessageRule__Group__0__Impl"

-

-

-	// $ANTLR start "rule__MessageRule__Group__1"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:197:1: rule__MessageRule__Group__1 : rule__MessageRule__Group__1__Impl

-	// rule__MessageRule__Group__2 ;

-	public final void rule__MessageRule__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:201:1: ( rule__MessageRule__Group__1__Impl rule__MessageRule__Group__2 )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:202:2: rule__MessageRule__Group__1__Impl rule__MessageRule__Group__2

-			{

-				pushFollow(FOLLOW_rule__MessageRule__Group__1__Impl_in_rule__MessageRule__Group__1359);

-				rule__MessageRule__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__MessageRule__Group__2_in_rule__MessageRule__Group__1362);

-				rule__MessageRule__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__MessageRule__Group__1"

-

-

-	// $ANTLR start "rule__MessageRule__Group__1__Impl"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:209:1: rule__MessageRule__Group__1__Impl : ( ( rule__MessageRule__Group_1__0 )* ) ;

-	public final void rule__MessageRule__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:213:1: ( ( ( rule__MessageRule__Group_1__0 )* ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:214:1: ( ( rule__MessageRule__Group_1__0 )* )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:214:1: ( ( rule__MessageRule__Group_1__0 )* )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:215:1: ( rule__MessageRule__Group_1__0 )*

-				{

-					before(grammarAccess.getMessageRuleAccess().getGroup_1());

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:216:1: ( rule__MessageRule__Group_1__0 )*

-					loop2: do {

-						int alt2 = 2;

-						int LA2_0 = input.LA(1);

-

-						if ((LA2_0 == 14)) {

-							alt2 = 1;

-						}

-

-

-						switch (alt2) {

-						case 1:

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:216:2: rule__MessageRule__Group_1__0

-						{

-							pushFollow(FOLLOW_rule__MessageRule__Group_1__0_in_rule__MessageRule__Group__1__Impl389);

-							rule__MessageRule__Group_1__0();

-

-							state._fsp--;

-

-

-						}

-							break;

-

-						default:

-							break loop2;

-						}

-					} while (true);

-

-					after(grammarAccess.getMessageRuleAccess().getGroup_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__MessageRule__Group__1__Impl"

-

-

-	// $ANTLR start "rule__MessageRule__Group__2"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:226:1: rule__MessageRule__Group__2 : rule__MessageRule__Group__2__Impl

-	// rule__MessageRule__Group__3 ;

-	public final void rule__MessageRule__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:230:1: ( rule__MessageRule__Group__2__Impl rule__MessageRule__Group__3 )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:231:2: rule__MessageRule__Group__2__Impl rule__MessageRule__Group__3

-			{

-				pushFollow(FOLLOW_rule__MessageRule__Group__2__Impl_in_rule__MessageRule__Group__2420);

-				rule__MessageRule__Group__2__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__MessageRule__Group__3_in_rule__MessageRule__Group__2423);

-				rule__MessageRule__Group__3();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__MessageRule__Group__2"

-

-

-	// $ANTLR start "rule__MessageRule__Group__2__Impl"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:238:1: rule__MessageRule__Group__2__Impl : ( ':' ) ;

-	public final void rule__MessageRule__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:242:1: ( ( ':' ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:243:1: ( ':' )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:243:1: ( ':' )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:244:1: ':'

-				{

-					before(grammarAccess.getMessageRuleAccess().getColonKeyword_2());

-					match(input, 13, FOLLOW_13_in_rule__MessageRule__Group__2__Impl451);

-					after(grammarAccess.getMessageRuleAccess().getColonKeyword_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__MessageRule__Group__2__Impl"

-

-

-	// $ANTLR start "rule__MessageRule__Group__3"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:257:1: rule__MessageRule__Group__3 : rule__MessageRule__Group__3__Impl ;

-	public final void rule__MessageRule__Group__3() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:261:1: ( rule__MessageRule__Group__3__Impl )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:262:2: rule__MessageRule__Group__3__Impl

-			{

-				pushFollow(FOLLOW_rule__MessageRule__Group__3__Impl_in_rule__MessageRule__Group__3482);

-				rule__MessageRule__Group__3__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__MessageRule__Group__3"

-

-

-	// $ANTLR start "rule__MessageRule__Group__3__Impl"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:268:1: rule__MessageRule__Group__3__Impl : ( ( rule__MessageRule__NameAssignment_3 ) ) ;

-	public final void rule__MessageRule__Group__3__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:272:1: ( ( ( rule__MessageRule__NameAssignment_3 ) ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:273:1: ( ( rule__MessageRule__NameAssignment_3 ) )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:273:1: ( ( rule__MessageRule__NameAssignment_3 ) )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:274:1: ( rule__MessageRule__NameAssignment_3 )

-				{

-					before(grammarAccess.getMessageRuleAccess().getNameAssignment_3());

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:275:1: ( rule__MessageRule__NameAssignment_3 )

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:275:2: rule__MessageRule__NameAssignment_3

-					{

-						pushFollow(FOLLOW_rule__MessageRule__NameAssignment_3_in_rule__MessageRule__Group__3__Impl509);

-						rule__MessageRule__NameAssignment_3();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getMessageRuleAccess().getNameAssignment_3());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__MessageRule__Group__3__Impl"

-

-

-	// $ANTLR start "rule__MessageRule__Group_1__0"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:293:1: rule__MessageRule__Group_1__0 : rule__MessageRule__Group_1__0__Impl

-	// rule__MessageRule__Group_1__1 ;

-	public final void rule__MessageRule__Group_1__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:297:1: ( rule__MessageRule__Group_1__0__Impl rule__MessageRule__Group_1__1 )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:298:2: rule__MessageRule__Group_1__0__Impl rule__MessageRule__Group_1__1

-			{

-				pushFollow(FOLLOW_rule__MessageRule__Group_1__0__Impl_in_rule__MessageRule__Group_1__0547);

-				rule__MessageRule__Group_1__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__MessageRule__Group_1__1_in_rule__MessageRule__Group_1__0550);

-				rule__MessageRule__Group_1__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__MessageRule__Group_1__0"

-

-

-	// $ANTLR start "rule__MessageRule__Group_1__0__Impl"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:305:1: rule__MessageRule__Group_1__0__Impl : ( '.' ) ;

-	public final void rule__MessageRule__Group_1__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:309:1: ( ( '.' ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:310:1: ( '.' )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:310:1: ( '.' )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:311:1: '.'

-				{

-					before(grammarAccess.getMessageRuleAccess().getFullStopKeyword_1_0());

-					match(input, 14, FOLLOW_14_in_rule__MessageRule__Group_1__0__Impl578);

-					after(grammarAccess.getMessageRuleAccess().getFullStopKeyword_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__MessageRule__Group_1__0__Impl"

-

-

-	// $ANTLR start "rule__MessageRule__Group_1__1"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:324:1: rule__MessageRule__Group_1__1 : rule__MessageRule__Group_1__1__Impl ;

-	public final void rule__MessageRule__Group_1__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:328:1: ( rule__MessageRule__Group_1__1__Impl )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:329:2: rule__MessageRule__Group_1__1__Impl

-			{

-				pushFollow(FOLLOW_rule__MessageRule__Group_1__1__Impl_in_rule__MessageRule__Group_1__1609);

-				rule__MessageRule__Group_1__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__MessageRule__Group_1__1"

-

-

-	// $ANTLR start "rule__MessageRule__Group_1__1__Impl"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:335:1: rule__MessageRule__Group_1__1__Impl : ( (

-	// rule__MessageRule__SequenceTermAssignment_1_1 ) ) ;

-	public final void rule__MessageRule__Group_1__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:339:1: ( ( ( rule__MessageRule__SequenceTermAssignment_1_1 ) ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:340:1: ( ( rule__MessageRule__SequenceTermAssignment_1_1 ) )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:340:1: ( ( rule__MessageRule__SequenceTermAssignment_1_1 ) )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:341:1: ( rule__MessageRule__SequenceTermAssignment_1_1 )

-				{

-					before(grammarAccess.getMessageRuleAccess().getSequenceTermAssignment_1_1());

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:342:1: ( rule__MessageRule__SequenceTermAssignment_1_1 )

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:342:2: rule__MessageRule__SequenceTermAssignment_1_1

-					{

-						pushFollow(FOLLOW_rule__MessageRule__SequenceTermAssignment_1_1_in_rule__MessageRule__Group_1__1__Impl636);

-						rule__MessageRule__SequenceTermAssignment_1_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getMessageRuleAccess().getSequenceTermAssignment_1_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__MessageRule__Group_1__1__Impl"

-

-

-	// $ANTLR start "rule__SequenceTermRule__Group__0"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:356:1: rule__SequenceTermRule__Group__0 : rule__SequenceTermRule__Group__0__Impl

-	// rule__SequenceTermRule__Group__1 ;

-	public final void rule__SequenceTermRule__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:360:1: ( rule__SequenceTermRule__Group__0__Impl rule__SequenceTermRule__Group__1 )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:361:2: rule__SequenceTermRule__Group__0__Impl rule__SequenceTermRule__Group__1

-			{

-				pushFollow(FOLLOW_rule__SequenceTermRule__Group__0__Impl_in_rule__SequenceTermRule__Group__0670);

-				rule__SequenceTermRule__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__SequenceTermRule__Group__1_in_rule__SequenceTermRule__Group__0673);

-				rule__SequenceTermRule__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SequenceTermRule__Group__0"

-

-

-	// $ANTLR start "rule__SequenceTermRule__Group__0__Impl"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:368:1: rule__SequenceTermRule__Group__0__Impl : ( (

-	// rule__SequenceTermRule__SequencialOrderAssignment_0 ) ) ;

-	public final void rule__SequenceTermRule__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:372:1: ( ( ( rule__SequenceTermRule__SequencialOrderAssignment_0 ) ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:373:1: ( ( rule__SequenceTermRule__SequencialOrderAssignment_0 ) )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:373:1: ( ( rule__SequenceTermRule__SequencialOrderAssignment_0 ) )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:374:1: ( rule__SequenceTermRule__SequencialOrderAssignment_0 )

-				{

-					before(grammarAccess.getSequenceTermRuleAccess().getSequencialOrderAssignment_0());

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:375:1: ( rule__SequenceTermRule__SequencialOrderAssignment_0 )

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:375:2: rule__SequenceTermRule__SequencialOrderAssignment_0

-					{

-						pushFollow(FOLLOW_rule__SequenceTermRule__SequencialOrderAssignment_0_in_rule__SequenceTermRule__Group__0__Impl700);

-						rule__SequenceTermRule__SequencialOrderAssignment_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getSequenceTermRuleAccess().getSequencialOrderAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SequenceTermRule__Group__0__Impl"

-

-

-	// $ANTLR start "rule__SequenceTermRule__Group__1"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:385:1: rule__SequenceTermRule__Group__1 : rule__SequenceTermRule__Group__1__Impl

-	// rule__SequenceTermRule__Group__2 ;

-	public final void rule__SequenceTermRule__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:389:1: ( rule__SequenceTermRule__Group__1__Impl rule__SequenceTermRule__Group__2 )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:390:2: rule__SequenceTermRule__Group__1__Impl rule__SequenceTermRule__Group__2

-			{

-				pushFollow(FOLLOW_rule__SequenceTermRule__Group__1__Impl_in_rule__SequenceTermRule__Group__1730);

-				rule__SequenceTermRule__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__SequenceTermRule__Group__2_in_rule__SequenceTermRule__Group__1733);

-				rule__SequenceTermRule__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SequenceTermRule__Group__1"

-

-

-	// $ANTLR start "rule__SequenceTermRule__Group__1__Impl"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:397:1: rule__SequenceTermRule__Group__1__Impl : ( (

-	// rule__SequenceTermRule__SequenceNameAssignment_1 )? ) ;

-	public final void rule__SequenceTermRule__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:401:1: ( ( ( rule__SequenceTermRule__SequenceNameAssignment_1 )? ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:402:1: ( ( rule__SequenceTermRule__SequenceNameAssignment_1 )? )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:402:1: ( ( rule__SequenceTermRule__SequenceNameAssignment_1 )? )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:403:1: ( rule__SequenceTermRule__SequenceNameAssignment_1 )?

-				{

-					before(grammarAccess.getSequenceTermRuleAccess().getSequenceNameAssignment_1());

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:404:1: ( rule__SequenceTermRule__SequenceNameAssignment_1 )?

-					int alt3 = 2;

-					int LA3_0 = input.LA(1);

-

-					if ((LA3_0 == RULE_ID)) {

-						alt3 = 1;

-					}

-					switch (alt3) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:404:2: rule__SequenceTermRule__SequenceNameAssignment_1

-					{

-						pushFollow(FOLLOW_rule__SequenceTermRule__SequenceNameAssignment_1_in_rule__SequenceTermRule__Group__1__Impl760);

-						rule__SequenceTermRule__SequenceNameAssignment_1();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getSequenceTermRuleAccess().getSequenceNameAssignment_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SequenceTermRule__Group__1__Impl"

-

-

-	// $ANTLR start "rule__SequenceTermRule__Group__2"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:414:1: rule__SequenceTermRule__Group__2 : rule__SequenceTermRule__Group__2__Impl ;

-	public final void rule__SequenceTermRule__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:418:1: ( rule__SequenceTermRule__Group__2__Impl )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:419:2: rule__SequenceTermRule__Group__2__Impl

-			{

-				pushFollow(FOLLOW_rule__SequenceTermRule__Group__2__Impl_in_rule__SequenceTermRule__Group__2791);

-				rule__SequenceTermRule__Group__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SequenceTermRule__Group__2"

-

-

-	// $ANTLR start "rule__SequenceTermRule__Group__2__Impl"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:425:1: rule__SequenceTermRule__Group__2__Impl : ( (

-	// rule__SequenceTermRule__RecurrenceAssignment_2 )? ) ;

-	public final void rule__SequenceTermRule__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:429:1: ( ( ( rule__SequenceTermRule__RecurrenceAssignment_2 )? ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:430:1: ( ( rule__SequenceTermRule__RecurrenceAssignment_2 )? )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:430:1: ( ( rule__SequenceTermRule__RecurrenceAssignment_2 )? )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:431:1: ( rule__SequenceTermRule__RecurrenceAssignment_2 )?

-				{

-					before(grammarAccess.getSequenceTermRuleAccess().getRecurrenceAssignment_2());

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:432:1: ( rule__SequenceTermRule__RecurrenceAssignment_2 )?

-					int alt4 = 2;

-					int LA4_0 = input.LA(1);

-

-					if (((LA4_0 >= 15 && LA4_0 <= 16))) {

-						alt4 = 1;

-					}

-					switch (alt4) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:432:2: rule__SequenceTermRule__RecurrenceAssignment_2

-					{

-						pushFollow(FOLLOW_rule__SequenceTermRule__RecurrenceAssignment_2_in_rule__SequenceTermRule__Group__2__Impl818);

-						rule__SequenceTermRule__RecurrenceAssignment_2();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getSequenceTermRuleAccess().getRecurrenceAssignment_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SequenceTermRule__Group__2__Impl"

-

-

-	// $ANTLR start "rule__RecurrenceRule__Group_0__0"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:448:1: rule__RecurrenceRule__Group_0__0 : rule__RecurrenceRule__Group_0__0__Impl

-	// rule__RecurrenceRule__Group_0__1 ;

-	public final void rule__RecurrenceRule__Group_0__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:452:1: ( rule__RecurrenceRule__Group_0__0__Impl rule__RecurrenceRule__Group_0__1 )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:453:2: rule__RecurrenceRule__Group_0__0__Impl rule__RecurrenceRule__Group_0__1

-			{

-				pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__0__Impl_in_rule__RecurrenceRule__Group_0__0855);

-				rule__RecurrenceRule__Group_0__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__1_in_rule__RecurrenceRule__Group_0__0858);

-				rule__RecurrenceRule__Group_0__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__RecurrenceRule__Group_0__0"

-

-

-	// $ANTLR start "rule__RecurrenceRule__Group_0__0__Impl"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:460:1: rule__RecurrenceRule__Group_0__0__Impl : ( '*' ) ;

-	public final void rule__RecurrenceRule__Group_0__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:464:1: ( ( '*' ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:465:1: ( '*' )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:465:1: ( '*' )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:466:1: '*'

-				{

-					before(grammarAccess.getRecurrenceRuleAccess().getAsteriskKeyword_0_0());

-					match(input, 15, FOLLOW_15_in_rule__RecurrenceRule__Group_0__0__Impl886);

-					after(grammarAccess.getRecurrenceRuleAccess().getAsteriskKeyword_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__RecurrenceRule__Group_0__0__Impl"

-

-

-	// $ANTLR start "rule__RecurrenceRule__Group_0__1"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:479:1: rule__RecurrenceRule__Group_0__1 : rule__RecurrenceRule__Group_0__1__Impl

-	// rule__RecurrenceRule__Group_0__2 ;

-	public final void rule__RecurrenceRule__Group_0__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:483:1: ( rule__RecurrenceRule__Group_0__1__Impl rule__RecurrenceRule__Group_0__2 )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:484:2: rule__RecurrenceRule__Group_0__1__Impl rule__RecurrenceRule__Group_0__2

-			{

-				pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__1__Impl_in_rule__RecurrenceRule__Group_0__1917);

-				rule__RecurrenceRule__Group_0__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__2_in_rule__RecurrenceRule__Group_0__1920);

-				rule__RecurrenceRule__Group_0__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__RecurrenceRule__Group_0__1"

-

-

-	// $ANTLR start "rule__RecurrenceRule__Group_0__1__Impl"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:491:1: rule__RecurrenceRule__Group_0__1__Impl : ( '[' ) ;

-	public final void rule__RecurrenceRule__Group_0__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:495:1: ( ( '[' ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:496:1: ( '[' )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:496:1: ( '[' )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:497:1: '['

-				{

-					before(grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_0_1());

-					match(input, 16, FOLLOW_16_in_rule__RecurrenceRule__Group_0__1__Impl948);

-					after(grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_0_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__RecurrenceRule__Group_0__1__Impl"

-

-

-	// $ANTLR start "rule__RecurrenceRule__Group_0__2"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:510:1: rule__RecurrenceRule__Group_0__2 : rule__RecurrenceRule__Group_0__2__Impl

-	// rule__RecurrenceRule__Group_0__3 ;

-	public final void rule__RecurrenceRule__Group_0__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:514:1: ( rule__RecurrenceRule__Group_0__2__Impl rule__RecurrenceRule__Group_0__3 )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:515:2: rule__RecurrenceRule__Group_0__2__Impl rule__RecurrenceRule__Group_0__3

-			{

-				pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__2__Impl_in_rule__RecurrenceRule__Group_0__2979);

-				rule__RecurrenceRule__Group_0__2__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__3_in_rule__RecurrenceRule__Group_0__2982);

-				rule__RecurrenceRule__Group_0__3();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__RecurrenceRule__Group_0__2"

-

-

-	// $ANTLR start "rule__RecurrenceRule__Group_0__2__Impl"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:522:1: rule__RecurrenceRule__Group_0__2__Impl : ( RULE_STRING ) ;

-	public final void rule__RecurrenceRule__Group_0__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:526:1: ( ( RULE_STRING ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:527:1: ( RULE_STRING )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:527:1: ( RULE_STRING )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:528:1: RULE_STRING

-				{

-					before(grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_0_2());

-					match(input, RULE_STRING, FOLLOW_RULE_STRING_in_rule__RecurrenceRule__Group_0__2__Impl1009);

-					after(grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_0_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__RecurrenceRule__Group_0__2__Impl"

-

-

-	// $ANTLR start "rule__RecurrenceRule__Group_0__3"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:539:1: rule__RecurrenceRule__Group_0__3 : rule__RecurrenceRule__Group_0__3__Impl ;

-	public final void rule__RecurrenceRule__Group_0__3() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:543:1: ( rule__RecurrenceRule__Group_0__3__Impl )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:544:2: rule__RecurrenceRule__Group_0__3__Impl

-			{

-				pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__3__Impl_in_rule__RecurrenceRule__Group_0__31038);

-				rule__RecurrenceRule__Group_0__3__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__RecurrenceRule__Group_0__3"

-

-

-	// $ANTLR start "rule__RecurrenceRule__Group_0__3__Impl"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:550:1: rule__RecurrenceRule__Group_0__3__Impl : ( ']' ) ;

-	public final void rule__RecurrenceRule__Group_0__3__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:554:1: ( ( ']' ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:555:1: ( ']' )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:555:1: ( ']' )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:556:1: ']'

-				{

-					before(grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_0_3());

-					match(input, 17, FOLLOW_17_in_rule__RecurrenceRule__Group_0__3__Impl1066);

-					after(grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_0_3());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__RecurrenceRule__Group_0__3__Impl"

-

-

-	// $ANTLR start "rule__RecurrenceRule__Group_1__0"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:577:1: rule__RecurrenceRule__Group_1__0 : rule__RecurrenceRule__Group_1__0__Impl

-	// rule__RecurrenceRule__Group_1__1 ;

-	public final void rule__RecurrenceRule__Group_1__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:581:1: ( rule__RecurrenceRule__Group_1__0__Impl rule__RecurrenceRule__Group_1__1 )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:582:2: rule__RecurrenceRule__Group_1__0__Impl rule__RecurrenceRule__Group_1__1

-			{

-				pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__0__Impl_in_rule__RecurrenceRule__Group_1__01105);

-				rule__RecurrenceRule__Group_1__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__1_in_rule__RecurrenceRule__Group_1__01108);

-				rule__RecurrenceRule__Group_1__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__RecurrenceRule__Group_1__0"

-

-

-	// $ANTLR start "rule__RecurrenceRule__Group_1__0__Impl"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:589:1: rule__RecurrenceRule__Group_1__0__Impl : ( '[' ) ;

-	public final void rule__RecurrenceRule__Group_1__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:593:1: ( ( '[' ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:594:1: ( '[' )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:594:1: ( '[' )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:595:1: '['

-				{

-					before(grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_1_0());

-					match(input, 16, FOLLOW_16_in_rule__RecurrenceRule__Group_1__0__Impl1136);

-					after(grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__RecurrenceRule__Group_1__0__Impl"

-

-

-	// $ANTLR start "rule__RecurrenceRule__Group_1__1"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:608:1: rule__RecurrenceRule__Group_1__1 : rule__RecurrenceRule__Group_1__1__Impl

-	// rule__RecurrenceRule__Group_1__2 ;

-	public final void rule__RecurrenceRule__Group_1__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:612:1: ( rule__RecurrenceRule__Group_1__1__Impl rule__RecurrenceRule__Group_1__2 )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:613:2: rule__RecurrenceRule__Group_1__1__Impl rule__RecurrenceRule__Group_1__2

-			{

-				pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__1__Impl_in_rule__RecurrenceRule__Group_1__11167);

-				rule__RecurrenceRule__Group_1__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__2_in_rule__RecurrenceRule__Group_1__11170);

-				rule__RecurrenceRule__Group_1__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__RecurrenceRule__Group_1__1"

-

-

-	// $ANTLR start "rule__RecurrenceRule__Group_1__1__Impl"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:620:1: rule__RecurrenceRule__Group_1__1__Impl : ( RULE_STRING ) ;

-	public final void rule__RecurrenceRule__Group_1__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:624:1: ( ( RULE_STRING ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:625:1: ( RULE_STRING )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:625:1: ( RULE_STRING )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:626:1: RULE_STRING

-				{

-					before(grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_1_1());

-					match(input, RULE_STRING, FOLLOW_RULE_STRING_in_rule__RecurrenceRule__Group_1__1__Impl1197);

-					after(grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_1_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__RecurrenceRule__Group_1__1__Impl"

-

-

-	// $ANTLR start "rule__RecurrenceRule__Group_1__2"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:637:1: rule__RecurrenceRule__Group_1__2 : rule__RecurrenceRule__Group_1__2__Impl ;

-	public final void rule__RecurrenceRule__Group_1__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:641:1: ( rule__RecurrenceRule__Group_1__2__Impl )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:642:2: rule__RecurrenceRule__Group_1__2__Impl

-			{

-				pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__2__Impl_in_rule__RecurrenceRule__Group_1__21226);

-				rule__RecurrenceRule__Group_1__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__RecurrenceRule__Group_1__2"

-

-

-	// $ANTLR start "rule__RecurrenceRule__Group_1__2__Impl"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:648:1: rule__RecurrenceRule__Group_1__2__Impl : ( ']' ) ;

-	public final void rule__RecurrenceRule__Group_1__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:652:1: ( ( ']' ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:653:1: ( ']' )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:653:1: ( ']' )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:654:1: ']'

-				{

-					before(grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_1_2());

-					match(input, 17, FOLLOW_17_in_rule__RecurrenceRule__Group_1__2__Impl1254);

-					after(grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_1_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__RecurrenceRule__Group_1__2__Impl"

-

-

-	// $ANTLR start "rule__MessageRule__SequenceTermAssignment_0"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:674:1: rule__MessageRule__SequenceTermAssignment_0 : ( ruleSequenceTermRule ) ;

-	public final void rule__MessageRule__SequenceTermAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:678:1: ( ( ruleSequenceTermRule ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:679:1: ( ruleSequenceTermRule )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:679:1: ( ruleSequenceTermRule )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:680:1: ruleSequenceTermRule

-				{

-					before(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_0_0());

-					pushFollow(FOLLOW_ruleSequenceTermRule_in_rule__MessageRule__SequenceTermAssignment_01296);

-					ruleSequenceTermRule();

-

-					state._fsp--;

-

-					after(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__MessageRule__SequenceTermAssignment_0"

-

-

-	// $ANTLR start "rule__MessageRule__SequenceTermAssignment_1_1"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:689:1: rule__MessageRule__SequenceTermAssignment_1_1 : ( ruleSequenceTermRule ) ;

-	public final void rule__MessageRule__SequenceTermAssignment_1_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:693:1: ( ( ruleSequenceTermRule ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:694:1: ( ruleSequenceTermRule )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:694:1: ( ruleSequenceTermRule )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:695:1: ruleSequenceTermRule

-				{

-					before(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_1_1_0());

-					pushFollow(FOLLOW_ruleSequenceTermRule_in_rule__MessageRule__SequenceTermAssignment_1_11327);

-					ruleSequenceTermRule();

-

-					state._fsp--;

-

-					after(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_1_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__MessageRule__SequenceTermAssignment_1_1"

-

-

-	// $ANTLR start "rule__MessageRule__NameAssignment_3"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:704:1: rule__MessageRule__NameAssignment_3 : ( RULE_NAMERULE ) ;

-	public final void rule__MessageRule__NameAssignment_3() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:708:1: ( ( RULE_NAMERULE ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:709:1: ( RULE_NAMERULE )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:709:1: ( RULE_NAMERULE )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:710:1: RULE_NAMERULE

-				{

-					before(grammarAccess.getMessageRuleAccess().getNameNameRuleTerminalRuleCall_3_0());

-					match(input, RULE_NAMERULE, FOLLOW_RULE_NAMERULE_in_rule__MessageRule__NameAssignment_31358);

-					after(grammarAccess.getMessageRuleAccess().getNameNameRuleTerminalRuleCall_3_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__MessageRule__NameAssignment_3"

-

-

-	// $ANTLR start "rule__SequenceTermRule__SequencialOrderAssignment_0"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:719:1: rule__SequenceTermRule__SequencialOrderAssignment_0 : ( RULE_INT ) ;

-	public final void rule__SequenceTermRule__SequencialOrderAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:723:1: ( ( RULE_INT ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:724:1: ( RULE_INT )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:724:1: ( RULE_INT )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:725:1: RULE_INT

-				{

-					before(grammarAccess.getSequenceTermRuleAccess().getSequencialOrderINTTerminalRuleCall_0_0());

-					match(input, RULE_INT, FOLLOW_RULE_INT_in_rule__SequenceTermRule__SequencialOrderAssignment_01389);

-					after(grammarAccess.getSequenceTermRuleAccess().getSequencialOrderINTTerminalRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SequenceTermRule__SequencialOrderAssignment_0"

-

-

-	// $ANTLR start "rule__SequenceTermRule__SequenceNameAssignment_1"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:734:1: rule__SequenceTermRule__SequenceNameAssignment_1 : ( RULE_ID ) ;

-	public final void rule__SequenceTermRule__SequenceNameAssignment_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:738:1: ( ( RULE_ID ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:739:1: ( RULE_ID )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:739:1: ( RULE_ID )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:740:1: RULE_ID

-				{

-					before(grammarAccess.getSequenceTermRuleAccess().getSequenceNameIDTerminalRuleCall_1_0());

-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__SequenceTermRule__SequenceNameAssignment_11420);

-					after(grammarAccess.getSequenceTermRuleAccess().getSequenceNameIDTerminalRuleCall_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SequenceTermRule__SequenceNameAssignment_1"

-

-

-	// $ANTLR start "rule__SequenceTermRule__RecurrenceAssignment_2"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:749:1: rule__SequenceTermRule__RecurrenceAssignment_2 : ( ruleRecurrenceRule ) ;

-	public final void rule__SequenceTermRule__RecurrenceAssignment_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:753:1: ( ( ruleRecurrenceRule ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:754:1: ( ruleRecurrenceRule )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:754:1: ( ruleRecurrenceRule )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:755:1: ruleRecurrenceRule

-				{

-					before(grammarAccess.getSequenceTermRuleAccess().getRecurrenceRecurrenceRuleParserRuleCall_2_0());

-					pushFollow(FOLLOW_ruleRecurrenceRule_in_rule__SequenceTermRule__RecurrenceAssignment_21451);

-					ruleRecurrenceRule();

-

-					state._fsp--;

-

-					after(grammarAccess.getSequenceTermRuleAccess().getRecurrenceRecurrenceRuleParserRuleCall_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SequenceTermRule__RecurrenceAssignment_2"

-

-	// Delegated rules

-

-

-

-

-	public static final BitSet FOLLOW_ruleMessageRule_in_entryRuleMessageRule61 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleMessageRule68 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__MessageRule__Group__0_in_ruleMessageRule94 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSequenceTermRule_in_entryRuleSequenceTermRule121 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleSequenceTermRule128 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__SequenceTermRule__Group__0_in_ruleSequenceTermRule154 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleRecurrenceRule_in_entryRuleRecurrenceRule181 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleRecurrenceRule188 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__RecurrenceRule__Alternatives_in_ruleRecurrenceRule214 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_0__0_in_rule__RecurrenceRule__Alternatives250 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_1__0_in_rule__RecurrenceRule__Alternatives268 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__MessageRule__Group__0__Impl_in_rule__MessageRule__Group__0299 = new BitSet(new long[] { 0x0000000000006000L });

-	public static final BitSet FOLLOW_rule__MessageRule__Group__1_in_rule__MessageRule__Group__0302 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__MessageRule__SequenceTermAssignment_0_in_rule__MessageRule__Group__0__Impl329 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__MessageRule__Group__1__Impl_in_rule__MessageRule__Group__1359 = new BitSet(new long[] { 0x0000000000006000L });

-	public static final BitSet FOLLOW_rule__MessageRule__Group__2_in_rule__MessageRule__Group__1362 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__MessageRule__Group_1__0_in_rule__MessageRule__Group__1__Impl389 = new BitSet(new long[] { 0x0000000000004002L });

-	public static final BitSet FOLLOW_rule__MessageRule__Group__2__Impl_in_rule__MessageRule__Group__2420 = new BitSet(new long[] { 0x0000000000000020L });

-	public static final BitSet FOLLOW_rule__MessageRule__Group__3_in_rule__MessageRule__Group__2423 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_13_in_rule__MessageRule__Group__2__Impl451 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__MessageRule__Group__3__Impl_in_rule__MessageRule__Group__3482 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__MessageRule__NameAssignment_3_in_rule__MessageRule__Group__3__Impl509 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__MessageRule__Group_1__0__Impl_in_rule__MessageRule__Group_1__0547 = new BitSet(new long[] { 0x0000000000000040L });

-	public static final BitSet FOLLOW_rule__MessageRule__Group_1__1_in_rule__MessageRule__Group_1__0550 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_14_in_rule__MessageRule__Group_1__0__Impl578 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__MessageRule__Group_1__1__Impl_in_rule__MessageRule__Group_1__1609 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__MessageRule__SequenceTermAssignment_1_1_in_rule__MessageRule__Group_1__1__Impl636 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__SequenceTermRule__Group__0__Impl_in_rule__SequenceTermRule__Group__0670 = new BitSet(new long[] { 0x0000000000018080L });

-	public static final BitSet FOLLOW_rule__SequenceTermRule__Group__1_in_rule__SequenceTermRule__Group__0673 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__SequenceTermRule__SequencialOrderAssignment_0_in_rule__SequenceTermRule__Group__0__Impl700 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__SequenceTermRule__Group__1__Impl_in_rule__SequenceTermRule__Group__1730 = new BitSet(new long[] { 0x0000000000018080L });

-	public static final BitSet FOLLOW_rule__SequenceTermRule__Group__2_in_rule__SequenceTermRule__Group__1733 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__SequenceTermRule__SequenceNameAssignment_1_in_rule__SequenceTermRule__Group__1__Impl760 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__SequenceTermRule__Group__2__Impl_in_rule__SequenceTermRule__Group__2791 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__SequenceTermRule__RecurrenceAssignment_2_in_rule__SequenceTermRule__Group__2__Impl818 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_0__0__Impl_in_rule__RecurrenceRule__Group_0__0855 = new BitSet(new long[] { 0x0000000000010000L });

-	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_0__1_in_rule__RecurrenceRule__Group_0__0858 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_15_in_rule__RecurrenceRule__Group_0__0__Impl886 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_0__1__Impl_in_rule__RecurrenceRule__Group_0__1917 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_0__2_in_rule__RecurrenceRule__Group_0__1920 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_16_in_rule__RecurrenceRule__Group_0__1__Impl948 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_0__2__Impl_in_rule__RecurrenceRule__Group_0__2979 = new BitSet(new long[] { 0x0000000000020000L });

-	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_0__3_in_rule__RecurrenceRule__Group_0__2982 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_STRING_in_rule__RecurrenceRule__Group_0__2__Impl1009 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_0__3__Impl_in_rule__RecurrenceRule__Group_0__31038 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_17_in_rule__RecurrenceRule__Group_0__3__Impl1066 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_1__0__Impl_in_rule__RecurrenceRule__Group_1__01105 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_1__1_in_rule__RecurrenceRule__Group_1__01108 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_16_in_rule__RecurrenceRule__Group_1__0__Impl1136 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_1__1__Impl_in_rule__RecurrenceRule__Group_1__11167 = new BitSet(new long[] { 0x0000000000020000L });

-	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_1__2_in_rule__RecurrenceRule__Group_1__11170 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_STRING_in_rule__RecurrenceRule__Group_1__1__Impl1197 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_1__2__Impl_in_rule__RecurrenceRule__Group_1__21226 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_17_in_rule__RecurrenceRule__Group_1__2__Impl1254 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSequenceTermRule_in_rule__MessageRule__SequenceTermAssignment_01296 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSequenceTermRule_in_rule__MessageRule__SequenceTermAssignment_1_11327 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_NAMERULE_in_rule__MessageRule__NameAssignment_31358 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_INT_in_rule__SequenceTermRule__SequencialOrderAssignment_01389 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_rule__SequenceTermRule__SequenceNameAssignment_11420 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleRecurrenceRule_in_rule__SequenceTermRule__RecurrenceAssignment_21451 = new BitSet(new long[] { 0x0000000000000002L });

-

+package org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist.antlr.internal;
+
+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.uml.textedit.message.xtext.services.UmlMessageGrammarAccess;
+import org.eclipse.xtext.Grammar;
+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
+
+@SuppressWarnings("all")
+public class InternalUmlMessageParser extends AbstractInternalContentAssistParser {
+	public static final String[] tokenNames = new String[] {
+			"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_NAME_RULE", "RULE_INT", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_INTEGER_VALUE", "RULE_WS", "RULE_ANY_OTHER", "':'", "'.'", "'*'", "'['", "']'" };
+	public static final int RULE_ID = 7;
+	public static final int RULE_STRING = 4;
+	public static final int T__16 = 16;
+	public static final int T__15 = 15;
+	public static final int T__17 = 17;
+	public static final int T__14 = 14;
+	public static final int T__13 = 13;
+	public static final int RULE_ANY_OTHER = 12;
+	public static final int RULE_INT = 6;
+	public static final int RULE_INTEGER_VALUE = 10;
+	public static final int RULE_WS = 11;
+	public static final int RULE_SL_COMMENT = 9;
+	public static final int EOF = -1;
+	public static final int RULE_NAME_RULE = 5;
+	public static final int RULE_ML_COMMENT = 8;
+
+	// delegates
+	// delegators
+
+
+	public InternalUmlMessageParser(TokenStream input) {
+		this(input, new RecognizerSharedState());
+	}
+
+	public InternalUmlMessageParser(TokenStream input, RecognizerSharedState state) {
+		super(input, state);
+
+	}
+
+
+	@Override
+	public String[] getTokenNames() {
+		return InternalUmlMessageParser.tokenNames;
+	}
+
+	@Override
+	public String getGrammarFileName() {
+		return "../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g";
+	}
+
+
+
+	private UmlMessageGrammarAccess grammarAccess;
+
+	public void setGrammarAccess(UmlMessageGrammarAccess grammarAccess) {
+		this.grammarAccess = grammarAccess;
+	}
+
+	@Override
+	protected Grammar getGrammar() {
+		return grammarAccess.getGrammar();
+	}
+
+	@Override
+	protected String getValueForTokenName(String tokenName) {
+		return tokenName;
+	}
+
+
+
+
+	// $ANTLR start "entryRuleMessageRule"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:60:1: entryRuleMessageRule : ruleMessageRule EOF ;
+	public final void entryRuleMessageRule() throws RecognitionException {
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:61:1: ( ruleMessageRule EOF )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:62:1: ruleMessageRule EOF
+			{
+				before(grammarAccess.getMessageRuleRule());
+				pushFollow(FOLLOW_ruleMessageRule_in_entryRuleMessageRule61);
+				ruleMessageRule();
+
+				state._fsp--;
+
+				after(grammarAccess.getMessageRuleRule());
+				match(input, EOF, FOLLOW_EOF_in_entryRuleMessageRule68);
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+		}
+		return;
+	}
+	// $ANTLR end "entryRuleMessageRule"
+
+
+	// $ANTLR start "ruleMessageRule"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:69:1: ruleMessageRule : ( ( rule__MessageRule__Group__0 ) ) ;
+	public final void ruleMessageRule() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:73:2: ( ( ( rule__MessageRule__Group__0 ) ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:74:1: ( ( rule__MessageRule__Group__0 ) )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:74:1: ( ( rule__MessageRule__Group__0 ) )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:75:1: ( rule__MessageRule__Group__0 )
+				{
+					before(grammarAccess.getMessageRuleAccess().getGroup());
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:76:1: ( rule__MessageRule__Group__0 )
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:76:2: rule__MessageRule__Group__0
+					{
+						pushFollow(FOLLOW_rule__MessageRule__Group__0_in_ruleMessageRule94);
+						rule__MessageRule__Group__0();
+
+						state._fsp--;
+
+
+					}
+
+					after(grammarAccess.getMessageRuleAccess().getGroup());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "ruleMessageRule"
+
+
+	// $ANTLR start "entryRuleSequenceTermRule"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:88:1: entryRuleSequenceTermRule : ruleSequenceTermRule EOF ;
+	public final void entryRuleSequenceTermRule() throws RecognitionException {
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:89:1: ( ruleSequenceTermRule EOF )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:90:1: ruleSequenceTermRule EOF
+			{
+				before(grammarAccess.getSequenceTermRuleRule());
+				pushFollow(FOLLOW_ruleSequenceTermRule_in_entryRuleSequenceTermRule121);
+				ruleSequenceTermRule();
+
+				state._fsp--;
+
+				after(grammarAccess.getSequenceTermRuleRule());
+				match(input, EOF, FOLLOW_EOF_in_entryRuleSequenceTermRule128);
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+		}
+		return;
+	}
+	// $ANTLR end "entryRuleSequenceTermRule"
+
+
+	// $ANTLR start "ruleSequenceTermRule"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:97:1: ruleSequenceTermRule : ( ( rule__SequenceTermRule__Group__0 ) ) ;
+	public final void ruleSequenceTermRule() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:101:2: ( ( ( rule__SequenceTermRule__Group__0 ) ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:102:1: ( ( rule__SequenceTermRule__Group__0 ) )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:102:1: ( ( rule__SequenceTermRule__Group__0 ) )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:103:1: ( rule__SequenceTermRule__Group__0 )
+				{
+					before(grammarAccess.getSequenceTermRuleAccess().getGroup());
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:104:1: ( rule__SequenceTermRule__Group__0 )
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:104:2: rule__SequenceTermRule__Group__0
+					{
+						pushFollow(FOLLOW_rule__SequenceTermRule__Group__0_in_ruleSequenceTermRule154);
+						rule__SequenceTermRule__Group__0();
+
+						state._fsp--;
+
+
+					}
+
+					after(grammarAccess.getSequenceTermRuleAccess().getGroup());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "ruleSequenceTermRule"
+
+
+	// $ANTLR start "entryRuleRecurrenceRule"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:116:1: entryRuleRecurrenceRule : ruleRecurrenceRule EOF ;
+	public final void entryRuleRecurrenceRule() throws RecognitionException {
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:117:1: ( ruleRecurrenceRule EOF )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:118:1: ruleRecurrenceRule EOF
+			{
+				before(grammarAccess.getRecurrenceRuleRule());
+				pushFollow(FOLLOW_ruleRecurrenceRule_in_entryRuleRecurrenceRule181);
+				ruleRecurrenceRule();
+
+				state._fsp--;
+
+				after(grammarAccess.getRecurrenceRuleRule());
+				match(input, EOF, FOLLOW_EOF_in_entryRuleRecurrenceRule188);
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+		}
+		return;
+	}
+	// $ANTLR end "entryRuleRecurrenceRule"
+
+
+	// $ANTLR start "ruleRecurrenceRule"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:125:1: ruleRecurrenceRule : ( ( rule__RecurrenceRule__Alternatives ) ) ;
+	public final void ruleRecurrenceRule() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:129:2: ( ( ( rule__RecurrenceRule__Alternatives ) ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:130:1: ( ( rule__RecurrenceRule__Alternatives ) )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:130:1: ( ( rule__RecurrenceRule__Alternatives ) )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:131:1: ( rule__RecurrenceRule__Alternatives )
+				{
+					before(grammarAccess.getRecurrenceRuleAccess().getAlternatives());
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:132:1: ( rule__RecurrenceRule__Alternatives )
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:132:2: rule__RecurrenceRule__Alternatives
+					{
+						pushFollow(FOLLOW_rule__RecurrenceRule__Alternatives_in_ruleRecurrenceRule214);
+						rule__RecurrenceRule__Alternatives();
+
+						state._fsp--;
+
+
+					}
+
+					after(grammarAccess.getRecurrenceRuleAccess().getAlternatives());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "ruleRecurrenceRule"
+
+
+	// $ANTLR start "rule__RecurrenceRule__Alternatives"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:144:1: rule__RecurrenceRule__Alternatives : ( ( ( rule__RecurrenceRule__Group_0__0 ) ) | ( (
+	// rule__RecurrenceRule__Group_1__0 ) ) );
+	public final void rule__RecurrenceRule__Alternatives() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:148:1: ( ( ( rule__RecurrenceRule__Group_0__0 ) ) | ( (
+			// rule__RecurrenceRule__Group_1__0 ) ) )
+			int alt1 = 2;
+			int LA1_0 = input.LA(1);
+
+			if ((LA1_0 == 15)) {
+				alt1 = 1;
+			} else if ((LA1_0 == 16)) {
+				alt1 = 2;
+			} else {
+				NoViableAltException nvae = new NoViableAltException("", 1, 0, input);
+
+				throw nvae;
+			}
+			switch (alt1) {
+			case 1:
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:149:1: ( ( rule__RecurrenceRule__Group_0__0 ) )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:149:1: ( ( rule__RecurrenceRule__Group_0__0 ) )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:150:1: ( rule__RecurrenceRule__Group_0__0 )
+				{
+					before(grammarAccess.getRecurrenceRuleAccess().getGroup_0());
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:151:1: ( rule__RecurrenceRule__Group_0__0 )
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:151:2: rule__RecurrenceRule__Group_0__0
+					{
+						pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__0_in_rule__RecurrenceRule__Alternatives250);
+						rule__RecurrenceRule__Group_0__0();
+
+						state._fsp--;
+
+
+					}
+
+					after(grammarAccess.getRecurrenceRuleAccess().getGroup_0());
+
+				}
+
+
+			}
+				break;
+			case 2:
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:155:6: ( ( rule__RecurrenceRule__Group_1__0 ) )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:155:6: ( ( rule__RecurrenceRule__Group_1__0 ) )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:156:1: ( rule__RecurrenceRule__Group_1__0 )
+				{
+					before(grammarAccess.getRecurrenceRuleAccess().getGroup_1());
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:157:1: ( rule__RecurrenceRule__Group_1__0 )
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:157:2: rule__RecurrenceRule__Group_1__0
+					{
+						pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__0_in_rule__RecurrenceRule__Alternatives268);
+						rule__RecurrenceRule__Group_1__0();
+
+						state._fsp--;
+
+
+					}
+
+					after(grammarAccess.getRecurrenceRuleAccess().getGroup_1());
+
+				}
+
+
+			}
+				break;
+
+			}
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__RecurrenceRule__Alternatives"
+
+
+	// $ANTLR start "rule__MessageRule__Group__0"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:168:1: rule__MessageRule__Group__0 : rule__MessageRule__Group__0__Impl
+	// rule__MessageRule__Group__1 ;
+	public final void rule__MessageRule__Group__0() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:172:1: ( rule__MessageRule__Group__0__Impl rule__MessageRule__Group__1 )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:173:2: rule__MessageRule__Group__0__Impl rule__MessageRule__Group__1
+			{
+				pushFollow(FOLLOW_rule__MessageRule__Group__0__Impl_in_rule__MessageRule__Group__0299);
+				rule__MessageRule__Group__0__Impl();
+
+				state._fsp--;
+
+				pushFollow(FOLLOW_rule__MessageRule__Group__1_in_rule__MessageRule__Group__0302);
+				rule__MessageRule__Group__1();
+
+				state._fsp--;
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__MessageRule__Group__0"
+
+
+	// $ANTLR start "rule__MessageRule__Group__0__Impl"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:180:1: rule__MessageRule__Group__0__Impl : ( ( rule__MessageRule__SequenceTermAssignment_0 )
+	// ) ;
+	public final void rule__MessageRule__Group__0__Impl() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:184:1: ( ( ( rule__MessageRule__SequenceTermAssignment_0 ) ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:185:1: ( ( rule__MessageRule__SequenceTermAssignment_0 ) )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:185:1: ( ( rule__MessageRule__SequenceTermAssignment_0 ) )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:186:1: ( rule__MessageRule__SequenceTermAssignment_0 )
+				{
+					before(grammarAccess.getMessageRuleAccess().getSequenceTermAssignment_0());
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:187:1: ( rule__MessageRule__SequenceTermAssignment_0 )
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:187:2: rule__MessageRule__SequenceTermAssignment_0
+					{
+						pushFollow(FOLLOW_rule__MessageRule__SequenceTermAssignment_0_in_rule__MessageRule__Group__0__Impl329);
+						rule__MessageRule__SequenceTermAssignment_0();
+
+						state._fsp--;
+
+
+					}
+
+					after(grammarAccess.getMessageRuleAccess().getSequenceTermAssignment_0());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__MessageRule__Group__0__Impl"
+
+
+	// $ANTLR start "rule__MessageRule__Group__1"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:197:1: rule__MessageRule__Group__1 : rule__MessageRule__Group__1__Impl
+	// rule__MessageRule__Group__2 ;
+	public final void rule__MessageRule__Group__1() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:201:1: ( rule__MessageRule__Group__1__Impl rule__MessageRule__Group__2 )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:202:2: rule__MessageRule__Group__1__Impl rule__MessageRule__Group__2
+			{
+				pushFollow(FOLLOW_rule__MessageRule__Group__1__Impl_in_rule__MessageRule__Group__1359);
+				rule__MessageRule__Group__1__Impl();
+
+				state._fsp--;
+
+				pushFollow(FOLLOW_rule__MessageRule__Group__2_in_rule__MessageRule__Group__1362);
+				rule__MessageRule__Group__2();
+
+				state._fsp--;
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__MessageRule__Group__1"
+
+
+	// $ANTLR start "rule__MessageRule__Group__1__Impl"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:209:1: rule__MessageRule__Group__1__Impl : ( ( rule__MessageRule__Group_1__0 )* ) ;
+	public final void rule__MessageRule__Group__1__Impl() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:213:1: ( ( ( rule__MessageRule__Group_1__0 )* ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:214:1: ( ( rule__MessageRule__Group_1__0 )* )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:214:1: ( ( rule__MessageRule__Group_1__0 )* )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:215:1: ( rule__MessageRule__Group_1__0 )*
+				{
+					before(grammarAccess.getMessageRuleAccess().getGroup_1());
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:216:1: ( rule__MessageRule__Group_1__0 )*
+					loop2: do {
+						int alt2 = 2;
+						int LA2_0 = input.LA(1);
+
+						if ((LA2_0 == 14)) {
+							alt2 = 1;
+						}
+
+
+						switch (alt2) {
+						case 1:
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:216:2: rule__MessageRule__Group_1__0
+						{
+							pushFollow(FOLLOW_rule__MessageRule__Group_1__0_in_rule__MessageRule__Group__1__Impl389);
+							rule__MessageRule__Group_1__0();
+
+							state._fsp--;
+
+
+						}
+							break;
+
+						default:
+							break loop2;
+						}
+					} while (true);
+
+					after(grammarAccess.getMessageRuleAccess().getGroup_1());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__MessageRule__Group__1__Impl"
+
+
+	// $ANTLR start "rule__MessageRule__Group__2"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:226:1: rule__MessageRule__Group__2 : rule__MessageRule__Group__2__Impl
+	// rule__MessageRule__Group__3 ;
+	public final void rule__MessageRule__Group__2() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:230:1: ( rule__MessageRule__Group__2__Impl rule__MessageRule__Group__3 )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:231:2: rule__MessageRule__Group__2__Impl rule__MessageRule__Group__3
+			{
+				pushFollow(FOLLOW_rule__MessageRule__Group__2__Impl_in_rule__MessageRule__Group__2420);
+				rule__MessageRule__Group__2__Impl();
+
+				state._fsp--;
+
+				pushFollow(FOLLOW_rule__MessageRule__Group__3_in_rule__MessageRule__Group__2423);
+				rule__MessageRule__Group__3();
+
+				state._fsp--;
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__MessageRule__Group__2"
+
+
+	// $ANTLR start "rule__MessageRule__Group__2__Impl"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:238:1: rule__MessageRule__Group__2__Impl : ( ':' ) ;
+	public final void rule__MessageRule__Group__2__Impl() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:242:1: ( ( ':' ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:243:1: ( ':' )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:243:1: ( ':' )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:244:1: ':'
+				{
+					before(grammarAccess.getMessageRuleAccess().getColonKeyword_2());
+					match(input, 13, FOLLOW_13_in_rule__MessageRule__Group__2__Impl451);
+					after(grammarAccess.getMessageRuleAccess().getColonKeyword_2());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__MessageRule__Group__2__Impl"
+
+
+	// $ANTLR start "rule__MessageRule__Group__3"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:257:1: rule__MessageRule__Group__3 : rule__MessageRule__Group__3__Impl ;
+	public final void rule__MessageRule__Group__3() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:261:1: ( rule__MessageRule__Group__3__Impl )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:262:2: rule__MessageRule__Group__3__Impl
+			{
+				pushFollow(FOLLOW_rule__MessageRule__Group__3__Impl_in_rule__MessageRule__Group__3482);
+				rule__MessageRule__Group__3__Impl();
+
+				state._fsp--;
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__MessageRule__Group__3"
+
+
+	// $ANTLR start "rule__MessageRule__Group__3__Impl"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:268:1: rule__MessageRule__Group__3__Impl : ( ( rule__MessageRule__NameAssignment_3 ) ) ;
+	public final void rule__MessageRule__Group__3__Impl() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:272:1: ( ( ( rule__MessageRule__NameAssignment_3 ) ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:273:1: ( ( rule__MessageRule__NameAssignment_3 ) )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:273:1: ( ( rule__MessageRule__NameAssignment_3 ) )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:274:1: ( rule__MessageRule__NameAssignment_3 )
+				{
+					before(grammarAccess.getMessageRuleAccess().getNameAssignment_3());
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:275:1: ( rule__MessageRule__NameAssignment_3 )
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:275:2: rule__MessageRule__NameAssignment_3
+					{
+						pushFollow(FOLLOW_rule__MessageRule__NameAssignment_3_in_rule__MessageRule__Group__3__Impl509);
+						rule__MessageRule__NameAssignment_3();
+
+						state._fsp--;
+
+
+					}
+
+					after(grammarAccess.getMessageRuleAccess().getNameAssignment_3());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__MessageRule__Group__3__Impl"
+
+
+	// $ANTLR start "rule__MessageRule__Group_1__0"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:293:1: rule__MessageRule__Group_1__0 : rule__MessageRule__Group_1__0__Impl
+	// rule__MessageRule__Group_1__1 ;
+	public final void rule__MessageRule__Group_1__0() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:297:1: ( rule__MessageRule__Group_1__0__Impl rule__MessageRule__Group_1__1 )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:298:2: rule__MessageRule__Group_1__0__Impl rule__MessageRule__Group_1__1
+			{
+				pushFollow(FOLLOW_rule__MessageRule__Group_1__0__Impl_in_rule__MessageRule__Group_1__0547);
+				rule__MessageRule__Group_1__0__Impl();
+
+				state._fsp--;
+
+				pushFollow(FOLLOW_rule__MessageRule__Group_1__1_in_rule__MessageRule__Group_1__0550);
+				rule__MessageRule__Group_1__1();
+
+				state._fsp--;
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__MessageRule__Group_1__0"
+
+
+	// $ANTLR start "rule__MessageRule__Group_1__0__Impl"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:305:1: rule__MessageRule__Group_1__0__Impl : ( '.' ) ;
+	public final void rule__MessageRule__Group_1__0__Impl() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:309:1: ( ( '.' ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:310:1: ( '.' )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:310:1: ( '.' )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:311:1: '.'
+				{
+					before(grammarAccess.getMessageRuleAccess().getFullStopKeyword_1_0());
+					match(input, 14, FOLLOW_14_in_rule__MessageRule__Group_1__0__Impl578);
+					after(grammarAccess.getMessageRuleAccess().getFullStopKeyword_1_0());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__MessageRule__Group_1__0__Impl"
+
+
+	// $ANTLR start "rule__MessageRule__Group_1__1"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:324:1: rule__MessageRule__Group_1__1 : rule__MessageRule__Group_1__1__Impl ;
+	public final void rule__MessageRule__Group_1__1() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:328:1: ( rule__MessageRule__Group_1__1__Impl )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:329:2: rule__MessageRule__Group_1__1__Impl
+			{
+				pushFollow(FOLLOW_rule__MessageRule__Group_1__1__Impl_in_rule__MessageRule__Group_1__1609);
+				rule__MessageRule__Group_1__1__Impl();
+
+				state._fsp--;
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__MessageRule__Group_1__1"
+
+
+	// $ANTLR start "rule__MessageRule__Group_1__1__Impl"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:335:1: rule__MessageRule__Group_1__1__Impl : ( (
+	// rule__MessageRule__SequenceTermAssignment_1_1 ) ) ;
+	public final void rule__MessageRule__Group_1__1__Impl() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:339:1: ( ( ( rule__MessageRule__SequenceTermAssignment_1_1 ) ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:340:1: ( ( rule__MessageRule__SequenceTermAssignment_1_1 ) )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:340:1: ( ( rule__MessageRule__SequenceTermAssignment_1_1 ) )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:341:1: ( rule__MessageRule__SequenceTermAssignment_1_1 )
+				{
+					before(grammarAccess.getMessageRuleAccess().getSequenceTermAssignment_1_1());
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:342:1: ( rule__MessageRule__SequenceTermAssignment_1_1 )
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:342:2: rule__MessageRule__SequenceTermAssignment_1_1
+					{
+						pushFollow(FOLLOW_rule__MessageRule__SequenceTermAssignment_1_1_in_rule__MessageRule__Group_1__1__Impl636);
+						rule__MessageRule__SequenceTermAssignment_1_1();
+
+						state._fsp--;
+
+
+					}
+
+					after(grammarAccess.getMessageRuleAccess().getSequenceTermAssignment_1_1());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__MessageRule__Group_1__1__Impl"
+
+
+	// $ANTLR start "rule__SequenceTermRule__Group__0"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:356:1: rule__SequenceTermRule__Group__0 : rule__SequenceTermRule__Group__0__Impl
+	// rule__SequenceTermRule__Group__1 ;
+	public final void rule__SequenceTermRule__Group__0() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:360:1: ( rule__SequenceTermRule__Group__0__Impl rule__SequenceTermRule__Group__1 )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:361:2: rule__SequenceTermRule__Group__0__Impl rule__SequenceTermRule__Group__1
+			{
+				pushFollow(FOLLOW_rule__SequenceTermRule__Group__0__Impl_in_rule__SequenceTermRule__Group__0670);
+				rule__SequenceTermRule__Group__0__Impl();
+
+				state._fsp--;
+
+				pushFollow(FOLLOW_rule__SequenceTermRule__Group__1_in_rule__SequenceTermRule__Group__0673);
+				rule__SequenceTermRule__Group__1();
+
+				state._fsp--;
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__SequenceTermRule__Group__0"
+
+
+	// $ANTLR start "rule__SequenceTermRule__Group__0__Impl"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:368:1: rule__SequenceTermRule__Group__0__Impl : ( (
+	// rule__SequenceTermRule__SequencialOrderAssignment_0 ) ) ;
+	public final void rule__SequenceTermRule__Group__0__Impl() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:372:1: ( ( ( rule__SequenceTermRule__SequencialOrderAssignment_0 ) ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:373:1: ( ( rule__SequenceTermRule__SequencialOrderAssignment_0 ) )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:373:1: ( ( rule__SequenceTermRule__SequencialOrderAssignment_0 ) )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:374:1: ( rule__SequenceTermRule__SequencialOrderAssignment_0 )
+				{
+					before(grammarAccess.getSequenceTermRuleAccess().getSequencialOrderAssignment_0());
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:375:1: ( rule__SequenceTermRule__SequencialOrderAssignment_0 )
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:375:2: rule__SequenceTermRule__SequencialOrderAssignment_0
+					{
+						pushFollow(FOLLOW_rule__SequenceTermRule__SequencialOrderAssignment_0_in_rule__SequenceTermRule__Group__0__Impl700);
+						rule__SequenceTermRule__SequencialOrderAssignment_0();
+
+						state._fsp--;
+
+
+					}
+
+					after(grammarAccess.getSequenceTermRuleAccess().getSequencialOrderAssignment_0());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__SequenceTermRule__Group__0__Impl"
+
+
+	// $ANTLR start "rule__SequenceTermRule__Group__1"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:385:1: rule__SequenceTermRule__Group__1 : rule__SequenceTermRule__Group__1__Impl
+	// rule__SequenceTermRule__Group__2 ;
+	public final void rule__SequenceTermRule__Group__1() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:389:1: ( rule__SequenceTermRule__Group__1__Impl rule__SequenceTermRule__Group__2 )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:390:2: rule__SequenceTermRule__Group__1__Impl rule__SequenceTermRule__Group__2
+			{
+				pushFollow(FOLLOW_rule__SequenceTermRule__Group__1__Impl_in_rule__SequenceTermRule__Group__1730);
+				rule__SequenceTermRule__Group__1__Impl();
+
+				state._fsp--;
+
+				pushFollow(FOLLOW_rule__SequenceTermRule__Group__2_in_rule__SequenceTermRule__Group__1733);
+				rule__SequenceTermRule__Group__2();
+
+				state._fsp--;
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__SequenceTermRule__Group__1"
+
+
+	// $ANTLR start "rule__SequenceTermRule__Group__1__Impl"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:397:1: rule__SequenceTermRule__Group__1__Impl : ( (
+	// rule__SequenceTermRule__SequenceNameAssignment_1 )? ) ;
+	public final void rule__SequenceTermRule__Group__1__Impl() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:401:1: ( ( ( rule__SequenceTermRule__SequenceNameAssignment_1 )? ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:402:1: ( ( rule__SequenceTermRule__SequenceNameAssignment_1 )? )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:402:1: ( ( rule__SequenceTermRule__SequenceNameAssignment_1 )? )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:403:1: ( rule__SequenceTermRule__SequenceNameAssignment_1 )?
+				{
+					before(grammarAccess.getSequenceTermRuleAccess().getSequenceNameAssignment_1());
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:404:1: ( rule__SequenceTermRule__SequenceNameAssignment_1 )?
+					int alt3 = 2;
+					int LA3_0 = input.LA(1);
+
+					if ((LA3_0 == RULE_ID)) {
+						alt3 = 1;
+					}
+					switch (alt3) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:404:2: rule__SequenceTermRule__SequenceNameAssignment_1
+					{
+						pushFollow(FOLLOW_rule__SequenceTermRule__SequenceNameAssignment_1_in_rule__SequenceTermRule__Group__1__Impl760);
+						rule__SequenceTermRule__SequenceNameAssignment_1();
+
+						state._fsp--;
+
+
+					}
+						break;
+
+					}
+
+					after(grammarAccess.getSequenceTermRuleAccess().getSequenceNameAssignment_1());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__SequenceTermRule__Group__1__Impl"
+
+
+	// $ANTLR start "rule__SequenceTermRule__Group__2"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:414:1: rule__SequenceTermRule__Group__2 : rule__SequenceTermRule__Group__2__Impl ;
+	public final void rule__SequenceTermRule__Group__2() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:418:1: ( rule__SequenceTermRule__Group__2__Impl )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:419:2: rule__SequenceTermRule__Group__2__Impl
+			{
+				pushFollow(FOLLOW_rule__SequenceTermRule__Group__2__Impl_in_rule__SequenceTermRule__Group__2791);
+				rule__SequenceTermRule__Group__2__Impl();
+
+				state._fsp--;
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__SequenceTermRule__Group__2"
+
+
+	// $ANTLR start "rule__SequenceTermRule__Group__2__Impl"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:425:1: rule__SequenceTermRule__Group__2__Impl : ( (
+	// rule__SequenceTermRule__RecurrenceAssignment_2 )? ) ;
+	public final void rule__SequenceTermRule__Group__2__Impl() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:429:1: ( ( ( rule__SequenceTermRule__RecurrenceAssignment_2 )? ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:430:1: ( ( rule__SequenceTermRule__RecurrenceAssignment_2 )? )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:430:1: ( ( rule__SequenceTermRule__RecurrenceAssignment_2 )? )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:431:1: ( rule__SequenceTermRule__RecurrenceAssignment_2 )?
+				{
+					before(grammarAccess.getSequenceTermRuleAccess().getRecurrenceAssignment_2());
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:432:1: ( rule__SequenceTermRule__RecurrenceAssignment_2 )?
+					int alt4 = 2;
+					int LA4_0 = input.LA(1);
+
+					if (((LA4_0 >= 15 && LA4_0 <= 16))) {
+						alt4 = 1;
+					}
+					switch (alt4) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:432:2: rule__SequenceTermRule__RecurrenceAssignment_2
+					{
+						pushFollow(FOLLOW_rule__SequenceTermRule__RecurrenceAssignment_2_in_rule__SequenceTermRule__Group__2__Impl818);
+						rule__SequenceTermRule__RecurrenceAssignment_2();
+
+						state._fsp--;
+
+
+					}
+						break;
+
+					}
+
+					after(grammarAccess.getSequenceTermRuleAccess().getRecurrenceAssignment_2());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__SequenceTermRule__Group__2__Impl"
+
+
+	// $ANTLR start "rule__RecurrenceRule__Group_0__0"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:448:1: rule__RecurrenceRule__Group_0__0 : rule__RecurrenceRule__Group_0__0__Impl
+	// rule__RecurrenceRule__Group_0__1 ;
+	public final void rule__RecurrenceRule__Group_0__0() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:452:1: ( rule__RecurrenceRule__Group_0__0__Impl rule__RecurrenceRule__Group_0__1 )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:453:2: rule__RecurrenceRule__Group_0__0__Impl rule__RecurrenceRule__Group_0__1
+			{
+				pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__0__Impl_in_rule__RecurrenceRule__Group_0__0855);
+				rule__RecurrenceRule__Group_0__0__Impl();
+
+				state._fsp--;
+
+				pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__1_in_rule__RecurrenceRule__Group_0__0858);
+				rule__RecurrenceRule__Group_0__1();
+
+				state._fsp--;
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__RecurrenceRule__Group_0__0"
+
+
+	// $ANTLR start "rule__RecurrenceRule__Group_0__0__Impl"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:460:1: rule__RecurrenceRule__Group_0__0__Impl : ( '*' ) ;
+	public final void rule__RecurrenceRule__Group_0__0__Impl() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:464:1: ( ( '*' ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:465:1: ( '*' )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:465:1: ( '*' )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:466:1: '*'
+				{
+					before(grammarAccess.getRecurrenceRuleAccess().getAsteriskKeyword_0_0());
+					match(input, 15, FOLLOW_15_in_rule__RecurrenceRule__Group_0__0__Impl886);
+					after(grammarAccess.getRecurrenceRuleAccess().getAsteriskKeyword_0_0());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__RecurrenceRule__Group_0__0__Impl"
+
+
+	// $ANTLR start "rule__RecurrenceRule__Group_0__1"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:479:1: rule__RecurrenceRule__Group_0__1 : rule__RecurrenceRule__Group_0__1__Impl
+	// rule__RecurrenceRule__Group_0__2 ;
+	public final void rule__RecurrenceRule__Group_0__1() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:483:1: ( rule__RecurrenceRule__Group_0__1__Impl rule__RecurrenceRule__Group_0__2 )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:484:2: rule__RecurrenceRule__Group_0__1__Impl rule__RecurrenceRule__Group_0__2
+			{
+				pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__1__Impl_in_rule__RecurrenceRule__Group_0__1917);
+				rule__RecurrenceRule__Group_0__1__Impl();
+
+				state._fsp--;
+
+				pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__2_in_rule__RecurrenceRule__Group_0__1920);
+				rule__RecurrenceRule__Group_0__2();
+
+				state._fsp--;
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__RecurrenceRule__Group_0__1"
+
+
+	// $ANTLR start "rule__RecurrenceRule__Group_0__1__Impl"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:491:1: rule__RecurrenceRule__Group_0__1__Impl : ( '[' ) ;
+	public final void rule__RecurrenceRule__Group_0__1__Impl() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:495:1: ( ( '[' ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:496:1: ( '[' )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:496:1: ( '[' )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:497:1: '['
+				{
+					before(grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_0_1());
+					match(input, 16, FOLLOW_16_in_rule__RecurrenceRule__Group_0__1__Impl948);
+					after(grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_0_1());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__RecurrenceRule__Group_0__1__Impl"
+
+
+	// $ANTLR start "rule__RecurrenceRule__Group_0__2"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:510:1: rule__RecurrenceRule__Group_0__2 : rule__RecurrenceRule__Group_0__2__Impl
+	// rule__RecurrenceRule__Group_0__3 ;
+	public final void rule__RecurrenceRule__Group_0__2() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:514:1: ( rule__RecurrenceRule__Group_0__2__Impl rule__RecurrenceRule__Group_0__3 )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:515:2: rule__RecurrenceRule__Group_0__2__Impl rule__RecurrenceRule__Group_0__3
+			{
+				pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__2__Impl_in_rule__RecurrenceRule__Group_0__2979);
+				rule__RecurrenceRule__Group_0__2__Impl();
+
+				state._fsp--;
+
+				pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__3_in_rule__RecurrenceRule__Group_0__2982);
+				rule__RecurrenceRule__Group_0__3();
+
+				state._fsp--;
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__RecurrenceRule__Group_0__2"
+
+
+	// $ANTLR start "rule__RecurrenceRule__Group_0__2__Impl"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:522:1: rule__RecurrenceRule__Group_0__2__Impl : ( RULE_STRING ) ;
+	public final void rule__RecurrenceRule__Group_0__2__Impl() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:526:1: ( ( RULE_STRING ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:527:1: ( RULE_STRING )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:527:1: ( RULE_STRING )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:528:1: RULE_STRING
+				{
+					before(grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_0_2());
+					match(input, RULE_STRING, FOLLOW_RULE_STRING_in_rule__RecurrenceRule__Group_0__2__Impl1009);
+					after(grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_0_2());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__RecurrenceRule__Group_0__2__Impl"
+
+
+	// $ANTLR start "rule__RecurrenceRule__Group_0__3"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:539:1: rule__RecurrenceRule__Group_0__3 : rule__RecurrenceRule__Group_0__3__Impl ;
+	public final void rule__RecurrenceRule__Group_0__3() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:543:1: ( rule__RecurrenceRule__Group_0__3__Impl )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:544:2: rule__RecurrenceRule__Group_0__3__Impl
+			{
+				pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__3__Impl_in_rule__RecurrenceRule__Group_0__31038);
+				rule__RecurrenceRule__Group_0__3__Impl();
+
+				state._fsp--;
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__RecurrenceRule__Group_0__3"
+
+
+	// $ANTLR start "rule__RecurrenceRule__Group_0__3__Impl"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:550:1: rule__RecurrenceRule__Group_0__3__Impl : ( ']' ) ;
+	public final void rule__RecurrenceRule__Group_0__3__Impl() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:554:1: ( ( ']' ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:555:1: ( ']' )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:555:1: ( ']' )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:556:1: ']'
+				{
+					before(grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_0_3());
+					match(input, 17, FOLLOW_17_in_rule__RecurrenceRule__Group_0__3__Impl1066);
+					after(grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_0_3());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__RecurrenceRule__Group_0__3__Impl"
+
+
+	// $ANTLR start "rule__RecurrenceRule__Group_1__0"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:577:1: rule__RecurrenceRule__Group_1__0 : rule__RecurrenceRule__Group_1__0__Impl
+	// rule__RecurrenceRule__Group_1__1 ;
+	public final void rule__RecurrenceRule__Group_1__0() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:581:1: ( rule__RecurrenceRule__Group_1__0__Impl rule__RecurrenceRule__Group_1__1 )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:582:2: rule__RecurrenceRule__Group_1__0__Impl rule__RecurrenceRule__Group_1__1
+			{
+				pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__0__Impl_in_rule__RecurrenceRule__Group_1__01105);
+				rule__RecurrenceRule__Group_1__0__Impl();
+
+				state._fsp--;
+
+				pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__1_in_rule__RecurrenceRule__Group_1__01108);
+				rule__RecurrenceRule__Group_1__1();
+
+				state._fsp--;
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__RecurrenceRule__Group_1__0"
+
+
+	// $ANTLR start "rule__RecurrenceRule__Group_1__0__Impl"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:589:1: rule__RecurrenceRule__Group_1__0__Impl : ( '[' ) ;
+	public final void rule__RecurrenceRule__Group_1__0__Impl() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:593:1: ( ( '[' ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:594:1: ( '[' )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:594:1: ( '[' )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:595:1: '['
+				{
+					before(grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_1_0());
+					match(input, 16, FOLLOW_16_in_rule__RecurrenceRule__Group_1__0__Impl1136);
+					after(grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_1_0());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__RecurrenceRule__Group_1__0__Impl"
+
+
+	// $ANTLR start "rule__RecurrenceRule__Group_1__1"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:608:1: rule__RecurrenceRule__Group_1__1 : rule__RecurrenceRule__Group_1__1__Impl
+	// rule__RecurrenceRule__Group_1__2 ;
+	public final void rule__RecurrenceRule__Group_1__1() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:612:1: ( rule__RecurrenceRule__Group_1__1__Impl rule__RecurrenceRule__Group_1__2 )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:613:2: rule__RecurrenceRule__Group_1__1__Impl rule__RecurrenceRule__Group_1__2
+			{
+				pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__1__Impl_in_rule__RecurrenceRule__Group_1__11167);
+				rule__RecurrenceRule__Group_1__1__Impl();
+
+				state._fsp--;
+
+				pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__2_in_rule__RecurrenceRule__Group_1__11170);
+				rule__RecurrenceRule__Group_1__2();
+
+				state._fsp--;
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__RecurrenceRule__Group_1__1"
+
+
+	// $ANTLR start "rule__RecurrenceRule__Group_1__1__Impl"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:620:1: rule__RecurrenceRule__Group_1__1__Impl : ( RULE_STRING ) ;
+	public final void rule__RecurrenceRule__Group_1__1__Impl() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:624:1: ( ( RULE_STRING ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:625:1: ( RULE_STRING )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:625:1: ( RULE_STRING )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:626:1: RULE_STRING
+				{
+					before(grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_1_1());
+					match(input, RULE_STRING, FOLLOW_RULE_STRING_in_rule__RecurrenceRule__Group_1__1__Impl1197);
+					after(grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_1_1());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__RecurrenceRule__Group_1__1__Impl"
+
+
+	// $ANTLR start "rule__RecurrenceRule__Group_1__2"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:637:1: rule__RecurrenceRule__Group_1__2 : rule__RecurrenceRule__Group_1__2__Impl ;
+	public final void rule__RecurrenceRule__Group_1__2() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:641:1: ( rule__RecurrenceRule__Group_1__2__Impl )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:642:2: rule__RecurrenceRule__Group_1__2__Impl
+			{
+				pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__2__Impl_in_rule__RecurrenceRule__Group_1__21226);
+				rule__RecurrenceRule__Group_1__2__Impl();
+
+				state._fsp--;
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__RecurrenceRule__Group_1__2"
+
+
+	// $ANTLR start "rule__RecurrenceRule__Group_1__2__Impl"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:648:1: rule__RecurrenceRule__Group_1__2__Impl : ( ']' ) ;
+	public final void rule__RecurrenceRule__Group_1__2__Impl() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:652:1: ( ( ']' ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:653:1: ( ']' )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:653:1: ( ']' )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:654:1: ']'
+				{
+					before(grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_1_2());
+					match(input, 17, FOLLOW_17_in_rule__RecurrenceRule__Group_1__2__Impl1254);
+					after(grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_1_2());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__RecurrenceRule__Group_1__2__Impl"
+
+
+	// $ANTLR start "rule__MessageRule__SequenceTermAssignment_0"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:674:1: rule__MessageRule__SequenceTermAssignment_0 : ( ruleSequenceTermRule ) ;
+	public final void rule__MessageRule__SequenceTermAssignment_0() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:678:1: ( ( ruleSequenceTermRule ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:679:1: ( ruleSequenceTermRule )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:679:1: ( ruleSequenceTermRule )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:680:1: ruleSequenceTermRule
+				{
+					before(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_0_0());
+					pushFollow(FOLLOW_ruleSequenceTermRule_in_rule__MessageRule__SequenceTermAssignment_01296);
+					ruleSequenceTermRule();
+
+					state._fsp--;
+
+					after(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_0_0());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__MessageRule__SequenceTermAssignment_0"
+
+
+	// $ANTLR start "rule__MessageRule__SequenceTermAssignment_1_1"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:689:1: rule__MessageRule__SequenceTermAssignment_1_1 : ( ruleSequenceTermRule ) ;
+	public final void rule__MessageRule__SequenceTermAssignment_1_1() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:693:1: ( ( ruleSequenceTermRule ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:694:1: ( ruleSequenceTermRule )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:694:1: ( ruleSequenceTermRule )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:695:1: ruleSequenceTermRule
+				{
+					before(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_1_1_0());
+					pushFollow(FOLLOW_ruleSequenceTermRule_in_rule__MessageRule__SequenceTermAssignment_1_11327);
+					ruleSequenceTermRule();
+
+					state._fsp--;
+
+					after(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_1_1_0());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__MessageRule__SequenceTermAssignment_1_1"
+
+
+	// $ANTLR start "rule__MessageRule__NameAssignment_3"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:704:1: rule__MessageRule__NameAssignment_3 : ( RULE_NAME_RULE ) ;
+	public final void rule__MessageRule__NameAssignment_3() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:708:1: ( ( RULE_NAME_RULE ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:709:1: ( RULE_NAME_RULE )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:709:1: ( RULE_NAME_RULE )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:710:1: RULE_NAME_RULE
+				{
+					before(grammarAccess.getMessageRuleAccess().getNameNAME_RULETerminalRuleCall_3_0());
+					match(input, RULE_NAME_RULE, FOLLOW_RULE_NAME_RULE_in_rule__MessageRule__NameAssignment_31358);
+					after(grammarAccess.getMessageRuleAccess().getNameNAME_RULETerminalRuleCall_3_0());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__MessageRule__NameAssignment_3"
+
+
+	// $ANTLR start "rule__SequenceTermRule__SequencialOrderAssignment_0"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:719:1: rule__SequenceTermRule__SequencialOrderAssignment_0 : ( RULE_INT ) ;
+	public final void rule__SequenceTermRule__SequencialOrderAssignment_0() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:723:1: ( ( RULE_INT ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:724:1: ( RULE_INT )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:724:1: ( RULE_INT )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:725:1: RULE_INT
+				{
+					before(grammarAccess.getSequenceTermRuleAccess().getSequencialOrderINTTerminalRuleCall_0_0());
+					match(input, RULE_INT, FOLLOW_RULE_INT_in_rule__SequenceTermRule__SequencialOrderAssignment_01389);
+					after(grammarAccess.getSequenceTermRuleAccess().getSequencialOrderINTTerminalRuleCall_0_0());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__SequenceTermRule__SequencialOrderAssignment_0"
+
+
+	// $ANTLR start "rule__SequenceTermRule__SequenceNameAssignment_1"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:734:1: rule__SequenceTermRule__SequenceNameAssignment_1 : ( RULE_ID ) ;
+	public final void rule__SequenceTermRule__SequenceNameAssignment_1() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:738:1: ( ( RULE_ID ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:739:1: ( RULE_ID )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:739:1: ( RULE_ID )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:740:1: RULE_ID
+				{
+					before(grammarAccess.getSequenceTermRuleAccess().getSequenceNameIDTerminalRuleCall_1_0());
+					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__SequenceTermRule__SequenceNameAssignment_11420);
+					after(grammarAccess.getSequenceTermRuleAccess().getSequenceNameIDTerminalRuleCall_1_0());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__SequenceTermRule__SequenceNameAssignment_1"
+
+
+	// $ANTLR start "rule__SequenceTermRule__RecurrenceAssignment_2"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:749:1: rule__SequenceTermRule__RecurrenceAssignment_2 : ( ruleRecurrenceRule ) ;
+	public final void rule__SequenceTermRule__RecurrenceAssignment_2() throws RecognitionException {
+
+		int stackSize = keepStackSize();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:753:1: ( ( ruleRecurrenceRule ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:754:1: ( ruleRecurrenceRule )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:754:1: ( ruleRecurrenceRule )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:755:1: ruleRecurrenceRule
+				{
+					before(grammarAccess.getSequenceTermRuleAccess().getRecurrenceRecurrenceRuleParserRuleCall_2_0());
+					pushFollow(FOLLOW_ruleRecurrenceRule_in_rule__SequenceTermRule__RecurrenceAssignment_21451);
+					ruleRecurrenceRule();
+
+					state._fsp--;
+
+					after(grammarAccess.getSequenceTermRuleAccess().getRecurrenceRecurrenceRuleParserRuleCall_2_0());
+
+				}
+
+
+			}
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+
+			restoreStackSize(stackSize);
+
+		}
+		return;
+	}
+	// $ANTLR end "rule__SequenceTermRule__RecurrenceAssignment_2"
+
+	// Delegated rules
+
+
+
+
+	public static final BitSet FOLLOW_ruleMessageRule_in_entryRuleMessageRule61 = new BitSet(new long[] { 0x0000000000000000L });
+	public static final BitSet FOLLOW_EOF_in_entryRuleMessageRule68 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__MessageRule__Group__0_in_ruleMessageRule94 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_ruleSequenceTermRule_in_entryRuleSequenceTermRule121 = new BitSet(new long[] { 0x0000000000000000L });
+	public static final BitSet FOLLOW_EOF_in_entryRuleSequenceTermRule128 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__SequenceTermRule__Group__0_in_ruleSequenceTermRule154 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_ruleRecurrenceRule_in_entryRuleRecurrenceRule181 = new BitSet(new long[] { 0x0000000000000000L });
+	public static final BitSet FOLLOW_EOF_in_entryRuleRecurrenceRule188 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__RecurrenceRule__Alternatives_in_ruleRecurrenceRule214 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_0__0_in_rule__RecurrenceRule__Alternatives250 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_1__0_in_rule__RecurrenceRule__Alternatives268 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__MessageRule__Group__0__Impl_in_rule__MessageRule__Group__0299 = new BitSet(new long[] { 0x0000000000006000L });
+	public static final BitSet FOLLOW_rule__MessageRule__Group__1_in_rule__MessageRule__Group__0302 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__MessageRule__SequenceTermAssignment_0_in_rule__MessageRule__Group__0__Impl329 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__MessageRule__Group__1__Impl_in_rule__MessageRule__Group__1359 = new BitSet(new long[] { 0x0000000000006000L });
+	public static final BitSet FOLLOW_rule__MessageRule__Group__2_in_rule__MessageRule__Group__1362 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__MessageRule__Group_1__0_in_rule__MessageRule__Group__1__Impl389 = new BitSet(new long[] { 0x0000000000004002L });
+	public static final BitSet FOLLOW_rule__MessageRule__Group__2__Impl_in_rule__MessageRule__Group__2420 = new BitSet(new long[] { 0x0000000000000020L });
+	public static final BitSet FOLLOW_rule__MessageRule__Group__3_in_rule__MessageRule__Group__2423 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_13_in_rule__MessageRule__Group__2__Impl451 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__MessageRule__Group__3__Impl_in_rule__MessageRule__Group__3482 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__MessageRule__NameAssignment_3_in_rule__MessageRule__Group__3__Impl509 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__MessageRule__Group_1__0__Impl_in_rule__MessageRule__Group_1__0547 = new BitSet(new long[] { 0x0000000000000040L });
+	public static final BitSet FOLLOW_rule__MessageRule__Group_1__1_in_rule__MessageRule__Group_1__0550 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_14_in_rule__MessageRule__Group_1__0__Impl578 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__MessageRule__Group_1__1__Impl_in_rule__MessageRule__Group_1__1609 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__MessageRule__SequenceTermAssignment_1_1_in_rule__MessageRule__Group_1__1__Impl636 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__SequenceTermRule__Group__0__Impl_in_rule__SequenceTermRule__Group__0670 = new BitSet(new long[] { 0x0000000000018080L });
+	public static final BitSet FOLLOW_rule__SequenceTermRule__Group__1_in_rule__SequenceTermRule__Group__0673 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__SequenceTermRule__SequencialOrderAssignment_0_in_rule__SequenceTermRule__Group__0__Impl700 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__SequenceTermRule__Group__1__Impl_in_rule__SequenceTermRule__Group__1730 = new BitSet(new long[] { 0x0000000000018080L });
+	public static final BitSet FOLLOW_rule__SequenceTermRule__Group__2_in_rule__SequenceTermRule__Group__1733 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__SequenceTermRule__SequenceNameAssignment_1_in_rule__SequenceTermRule__Group__1__Impl760 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__SequenceTermRule__Group__2__Impl_in_rule__SequenceTermRule__Group__2791 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__SequenceTermRule__RecurrenceAssignment_2_in_rule__SequenceTermRule__Group__2__Impl818 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_0__0__Impl_in_rule__RecurrenceRule__Group_0__0855 = new BitSet(new long[] { 0x0000000000010000L });
+	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_0__1_in_rule__RecurrenceRule__Group_0__0858 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_15_in_rule__RecurrenceRule__Group_0__0__Impl886 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_0__1__Impl_in_rule__RecurrenceRule__Group_0__1917 = new BitSet(new long[] { 0x0000000000000010L });
+	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_0__2_in_rule__RecurrenceRule__Group_0__1920 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_16_in_rule__RecurrenceRule__Group_0__1__Impl948 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_0__2__Impl_in_rule__RecurrenceRule__Group_0__2979 = new BitSet(new long[] { 0x0000000000020000L });
+	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_0__3_in_rule__RecurrenceRule__Group_0__2982 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_RULE_STRING_in_rule__RecurrenceRule__Group_0__2__Impl1009 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_0__3__Impl_in_rule__RecurrenceRule__Group_0__31038 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_17_in_rule__RecurrenceRule__Group_0__3__Impl1066 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_1__0__Impl_in_rule__RecurrenceRule__Group_1__01105 = new BitSet(new long[] { 0x0000000000000010L });
+	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_1__1_in_rule__RecurrenceRule__Group_1__01108 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_16_in_rule__RecurrenceRule__Group_1__0__Impl1136 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_1__1__Impl_in_rule__RecurrenceRule__Group_1__11167 = new BitSet(new long[] { 0x0000000000020000L });
+	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_1__2_in_rule__RecurrenceRule__Group_1__11170 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_RULE_STRING_in_rule__RecurrenceRule__Group_1__1__Impl1197 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_rule__RecurrenceRule__Group_1__2__Impl_in_rule__RecurrenceRule__Group_1__21226 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_17_in_rule__RecurrenceRule__Group_1__2__Impl1254 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_ruleSequenceTermRule_in_rule__MessageRule__SequenceTermAssignment_01296 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_ruleSequenceTermRule_in_rule__MessageRule__SequenceTermAssignment_1_11327 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_RULE_NAME_RULE_in_rule__MessageRule__NameAssignment_31358 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_RULE_INT_in_rule__SequenceTermRule__SequencialOrderAssignment_01389 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_RULE_ID_in_rule__SequenceTermRule__SequenceNameAssignment_11420 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_ruleRecurrenceRule_in_rule__SequenceTermRule__RecurrenceAssignment_21451 = new BitSet(new long[] { 0x0000000000000002L });
+
 }
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contributions/AdvancedMessageDirectEditorConstraint.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contributions/AdvancedMessageDirectEditorConstraint.java
new file mode 100644
index 00000000000..1b1b830fafe
--- /dev/null
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contributions/AdvancedMessageDirectEditorConstraint.java
@@ -0,0 +1,60 @@
+/*****************************************************************************
+ * 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:
+ *  Gabriel Pascual - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.textedit.message.xtext.ui.contributions;
+
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConstraint;
+import org.eclipse.papyrus.uml.diagram.communication.edit.parts.MessageNameEditPart;
+
+/**
+ * Direct Editor constraint for Message of Communication diagram.
+ *
+ * @author Gabriel Pascual
+ *
+ */
+public class AdvancedMessageDirectEditorConstraint implements IDirectEditorConstraint {
+
+	/** The Constant CONSTRAINT_LABEL. */
+	private static final String CONSTRAINT_LABEL = "Advanced Message Editor Constraint";
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public AdvancedMessageDirectEditorConstraint() {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConstraint#getLabel()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getLabel() {
+		return CONSTRAINT_LABEL;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConstraint#appliesTo(java.lang.Object)
+	 *
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean appliesTo(Object selection) {
+
+		// The selection must be an Message edit part of Communication diagram
+		return selection instanceof MessageNameEditPart;
+	}
+
+}
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.antlr-generator-3.0.1.jar b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.antlr-generator-3.0.1.jar
deleted file mode 100644
index 4332d046be1..00000000000
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.antlr-generator-3.0.1.jar
+++ /dev/null
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.antlr-generator-3.2.0.jar b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.antlr-generator-3.2.0.jar
deleted file mode 100644
index 42434924055..00000000000
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.antlr-generator-3.2.0.jar
+++ /dev/null
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF
index c3ed9057a16..ae1463b3ffe 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF
@@ -1,41 +1,40 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.message.xtext,

- org.eclipse.papyrus.uml.textedit.message.xtext.formatting,

- org.eclipse.papyrus.uml.textedit.message.xtext.generator,

- org.eclipse.papyrus.uml.textedit.message.xtext.parser.antlr,

- org.eclipse.papyrus.uml.textedit.message.xtext.parser.antlr.internal,

- org.eclipse.papyrus.uml.textedit.message.xtext.scoping,

- org.eclipse.papyrus.uml.textedit.message.xtext.serializer,

- org.eclipse.papyrus.uml.textedit.message.xtext.services,

- org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage,

- org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl,

- org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.util,

- org.eclipse.papyrus.uml.textedit.message.xtext.validation

-Require-Bundle: org.eclipse.xtext,

- org.eclipse.xtext.generator;resolution:=optional,

- org.apache.commons.logging;resolution:=optional,

- org.eclipse.emf.codegen.ecore;resolution:=optional,

- org.eclipse.emf.mwe.utils;resolution:=optional,

- org.eclipse.emf.mwe2.launch;resolution:=optional,

- com.ibm.icu;resolution:=optional,

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.antlr.runtime,

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

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

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

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.1.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.1.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Import-Package: org.apache.log4j,

- org.eclipse.xtext.xbase.lib

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.message.xtext;si

- ngleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.message.xtext,
+ org.eclipse.papyrus.uml.textedit.message.xtext.formatting,
+ org.eclipse.papyrus.uml.textedit.message.xtext.generator,
+ org.eclipse.papyrus.uml.textedit.message.xtext.parser.antlr,
+ org.eclipse.papyrus.uml.textedit.message.xtext.parser.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.message.xtext.scoping,
+ org.eclipse.papyrus.uml.textedit.message.xtext.serializer,
+ org.eclipse.papyrus.uml.textedit.message.xtext.services,
+ org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage,
+ org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl,
+ org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.util,
+ org.eclipse.papyrus.uml.textedit.message.xtext.validation
+Require-Bundle: org.eclipse.xtext,
+ org.eclipse.xtext.generator;resolution:=optional,
+ org.apache.commons.logging;resolution:=optional,
+ org.eclipse.emf.codegen.ecore;resolution:=optional,
+ org.eclipse.emf.mwe.utils;resolution:=optional,
+ org.eclipse.emf.mwe2.launch;resolution:=optional,
+ com.ibm.icu;resolution:=optional,
+ org.eclipse.xtext.util,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.common,
+ org.antlr.runtime,
+ org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
+ org.eclipse.uml2.uml;bundle-version="3.1.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.apache.log4j;bundle-version="1.2.15",
+ org.eclipse.papyrus.uml.alf.common;bundle-version="1.1.0",
+ org.eclipse.xtext.xbase.lib
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.1.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Import-Package: org.apache.log4j,
+ org.eclipse.xtext.xbase.lib
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.message.xtext;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/AbstractUmlMessageRuntimeModule.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/AbstractUmlMessageRuntimeModule.java
index 63e68475b2e..ef704b2eba2 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/AbstractUmlMessageRuntimeModule.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/AbstractUmlMessageRuntimeModule.java
@@ -6,7 +6,6 @@ package org.eclipse.papyrus.uml.textedit.message.xtext;
 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;
@@ -15,7 +14,7 @@ import com.google.inject.name.Names;
  * Manual modifications go to {org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessageRuntimeModule}
  */
 @SuppressWarnings("all")
-public abstract class AbstractUmlMessageRuntimeModule extends DefaultRuntimeModule {
+public abstract class AbstractUmlMessageRuntimeModule extends org.eclipse.xtext.service.DefaultRuntimeModule {
 
 	protected Properties properties = null;
 
@@ -153,9 +152,8 @@ public abstract class AbstractUmlMessageRuntimeModule extends DefaultRuntimeModu
 	}
 
 	// 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))
+	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);
 	}
 
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.ecore b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.ecore
index 4f4efec1dfc..64e388ffadc 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.ecore
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.ecore
@@ -1,15 +1,15 @@
-<?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="umlMessage" nsURI="http://www.eclipse.org/papyrus/uml/textedit/message/xtext/UmlMessage"

-    nsPrefix="umlMessage">

-  <eClassifiers xsi:type="ecore:EClass" name="MessageRule">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="sequenceTerm" upperBound="-1"

-        eType="#//SequenceTermRule" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType ../../../../../../../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="SequenceTermRule">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sequencialOrder" eType="ecore:EDataType ../../../../../../../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sequenceName" eType="ecore:EDataType ../../../../../../../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="recurrence" eType="ecore:EDataType ../../../../../../../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-  </eClassifiers>

-</ecore:EPackage>

+<?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="umlMessage" nsURI="http://www.eclipse.org/papyrus/uml/textedit/message/xtext/UmlMessage"
+    nsPrefix="umlMessage">
+  <eClassifiers xsi:type="ecore:EClass" name="MessageRule">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="sequenceTerm" upperBound="-1"
+        eType="#//SequenceTermRule" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SequenceTermRule">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sequencialOrder" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sequenceName" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="recurrence" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.genmodel b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.genmodel
index a37d14220ab..6f3270c2396 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.genmodel
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.genmodel
@@ -1,22 +1,22 @@
-<?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.textedit.message.xtext/src-gen"

-    editDirectory="/org.eclipse.papyrus.uml.textedit.message.xtext.edit/src" editorDirectory="/org.eclipse.papyrus.uml.textedit.message.xtext.editor/src"

-    modelPluginID="org.eclipse.papyrus.uml.textedit.message.xtext" forceOverwrite="true"

-    modelName="UmlMessage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

-    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.uml.textedit.message.xtext.edit"

-    editorPluginID="org.eclipse.papyrus.uml.textedit.message.xtext.editor" runtimeVersion="2.9"

-    usedGenPackages="../../../../../../../../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">

-  <genPackages prefix="UmlMessage" basePackage="org.eclipse.papyrus.uml.textedit.message.xtext"

-      disposableProviderFactory="true" ecorePackage="UmlMessage.ecore#/">

-    <genClasses ecoreClass="UmlMessage.ecore#//MessageRule">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlMessage.ecore#//MessageRule/sequenceTerm"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlMessage.ecore#//MessageRule/name"/>

-    </genClasses>

-    <genClasses ecoreClass="UmlMessage.ecore#//SequenceTermRule">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlMessage.ecore#//SequenceTermRule/sequencialOrder"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlMessage.ecore#//SequenceTermRule/sequenceName"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlMessage.ecore#//SequenceTermRule/recurrence"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

+<?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.textedit.message.xtext/src-gen"
+    editDirectory="/org.eclipse.papyrus.uml.textedit.message.xtext.edit/src" editorDirectory="/org.eclipse.papyrus.uml.textedit.message.xtext.editor/src"
+    modelPluginID="org.eclipse.papyrus.uml.textedit.message.xtext" forceOverwrite="true"
+    modelName="UmlMessage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.uml.textedit.message.xtext.edit"
+    editorPluginID="org.eclipse.papyrus.uml.textedit.message.xtext.editor" runtimeVersion="2.10"
+    usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+  <genPackages prefix="UmlMessage" basePackage="org.eclipse.papyrus.uml.textedit.message.xtext"
+      disposableProviderFactory="true" ecorePackage="UmlMessage.ecore#/">
+    <genClasses ecoreClass="UmlMessage.ecore#//MessageRule">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlMessage.ecore#//MessageRule/sequenceTerm"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlMessage.ecore#//MessageRule/name"/>
+    </genClasses>
+    <genClasses ecoreClass="UmlMessage.ecore#//SequenceTermRule">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlMessage.ecore#//SequenceTermRule/sequencialOrder"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlMessage.ecore#//SequenceTermRule/sequenceName"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlMessage.ecore#//SequenceTermRule/recurrence"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.xtextbin b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.xtextbin
index faa76524115..fef51cafb37 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.xtextbin
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.xtextbin
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g
index 863e2fe70db..a804dd9545f 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalUmlMessage;
 
 options {
@@ -123,9 +123,9 @@ ruleMessageRule returns [EObject current=null]
     }
 (
 (
-		lv_name_4_0=RULE_NAMERULE
+		lv_name_4_0=RULE_NAME_RULE
 		{
-			newLeafNode(lv_name_4_0, grammarAccess.getMessageRuleAccess().getNameNameRuleTerminalRuleCall_3_0()); 
+			newLeafNode(lv_name_4_0, grammarAccess.getMessageRuleAccess().getNameNAME_RULETerminalRuleCall_3_0()); 
 		}
 		{
 	        if ($current==null) {
@@ -135,7 +135,7 @@ ruleMessageRule returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_4_0, 
-        		"nameRule");
+        		"NAME_RULE");
 	    }
 
 )
@@ -287,9 +287,7 @@ ruleRecurrenceRule returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRule
 
 
 
-RULE_NAMERULE : ('a'..'z'|'A'..'Z') ('a'..'z'|'A'..'Z'|'_'|'-'|'0'..'9'|'('|')')*;
-
-RULE_INTEGER_VALUE : (('0'|'1'..'9' ('_'? '0'..'9')*)|('0b'|'0B') '0'..'1' ('_'? '0'..'1')*|('0x'|'0X') ('0'..'9'|'a'..'f'|'A'..'F') ('_'? ('0'..'9'|'a'..'f'|'A'..'F'))*|'0' '_'? '0'..'7' ('_'? '0'..'7')*);
+RULE_NAME_RULE : ('a'..'z'|'A'..'Z') ('a'..'z'|'A'..'Z'|'_'|'-'|'0'..'9'|'('|')')*;
 
 RULE_ID : (('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*|'\'' ( options {greedy=false;} : . )*'\'');
 
@@ -301,6 +299,8 @@ RULE_SL_COMMENT : '//' ~(('\n'|'\r'|'@'))* ('\r'? '\n')?;
 
 RULE_INT : ('0'..'9')+;
 
+RULE_INTEGER_VALUE : (('0'|'1'..'9' ('_'? '0'..'9')*)|('0b'|'0B') '0'..'1' ('_'? '0'..'1')*|('0x'|'0X') ('0'..'9'|'a'..'f'|'A'..'F') ('_'? ('0'..'9'|'a'..'f'|'A'..'F'))*|'0' '_'? '0'..'7' ('_'? '0'..'7')*);
+
 RULE_WS : (' '|'\t'|'\r'|'\n')+;
 
 RULE_ANY_OTHER : .;
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.tokens b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.tokens
index 464e0d15bb1..05b8903a76f 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.tokens
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.tokens
@@ -1,19 +1,19 @@
-RULE_NAMERULE=4

-RULE_ID=6

-RULE_STRING=7

-T__16=16

-T__15=15

-T__17=17

-T__14=14

-T__13=13

-RULE_ANY_OTHER=12

-RULE_INT=5

-RULE_INTEGER_VALUE=8

-RULE_WS=11

-RULE_SL_COMMENT=10

-RULE_ML_COMMENT=9

-':'=14

-'['=16

-'*'=15

-'.'=13

-']'=17

+'*'=15
+'.'=13
+':'=14
+'['=16
+']'=17
+RULE_ANY_OTHER=12
+RULE_ID=6
+RULE_INT=5
+RULE_INTEGER_VALUE=10
+RULE_ML_COMMENT=8
+RULE_NAME_RULE=4
+RULE_SL_COMMENT=9
+RULE_STRING=7
+RULE_WS=11
+T__13=13
+T__14=14
+T__15=15
+T__16=16
+T__17=17
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessageLexer.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessageLexer.java
index 343d621b515..4702d572a53 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessageLexer.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessageLexer.java
@@ -1,1445 +1,1380 @@
-package org.eclipse.papyrus.uml.textedit.message.xtext.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 InternalUmlMessageLexer extends Lexer {

-	public static final int RULE_NAMERULE = 4;

-	public static final int RULE_ID = 6;

-	public static final int RULE_STRING = 7;

-	public static final int T__16 = 16;

-	public static final int T__15 = 15;

-	public static final int T__17 = 17;

-	public static final int T__14 = 14;

-	public static final int T__13 = 13;

-	public static final int RULE_ANY_OTHER = 12;

-	public static final int RULE_INT = 5;

-	public static final int RULE_INTEGER_VALUE = 8;

-	public static final int RULE_WS = 11;

-	public static final int RULE_SL_COMMENT = 10;

-	public static final int EOF = -1;

-	public static final int RULE_ML_COMMENT = 9;

-

-	// delegates

-	// delegators

-

-	public InternalUmlMessageLexer() {

-		;

-	}

-

-	public InternalUmlMessageLexer(CharStream input) {

-		this(input, new RecognizerSharedState());

-	}

-

-	public InternalUmlMessageLexer(CharStream input, RecognizerSharedState state) {

-		super(input, state);

-

-	}

-

-	@Override

-	public String getGrammarFileName() {

-		return "../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g";

-	}

-

-	// $ANTLR start "T__13"

-	public final void mT__13() throws RecognitionException {

-		try {

-			int _type = T__13;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:11:7: ( '.' )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:11:9: '.'

-			{

-				match('.');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__13"

-

-	// $ANTLR start "T__14"

-	public final void mT__14() throws RecognitionException {

-		try {

-			int _type = T__14;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:12:7: ( ':' )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:12:9: ':'

-			{

-				match(':');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__14"

-

-	// $ANTLR start "T__15"

-	public final void mT__15() throws RecognitionException {

-		try {

-			int _type = T__15;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:13:7: ( '*' )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:13:9: '*'

-			{

-				match('*');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__15"

-

-	// $ANTLR start "T__16"

-	public final void mT__16() throws RecognitionException {

-		try {

-			int _type = T__16;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:14:7: ( '[' )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:14:9: '['

-			{

-				match('[');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__16"

-

-	// $ANTLR start "T__17"

-	public final void mT__17() throws RecognitionException {

-		try {

-			int _type = T__17;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:15:7: ( ']' )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:15:9: ']'

-			{

-				match(']');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__17"

-

-	// $ANTLR start "RULE_NAMERULE"

-	public final void mRULE_NAMERULE() throws RecognitionException {

-		try {

-			int _type = RULE_NAMERULE;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:290:15: ( ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' | '(' |

-			// ')' )* )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:290:17: ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' | '(' |

-			// ')' )*

-			{

-				if ((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;

-				}

-

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:290:37: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' | '(' | ')' )*

-				loop1: do {

-					int alt1 = 2;

-					int LA1_0 = input.LA(1);

-

-					if (((LA1_0 >= '(' && LA1_0 <= ')') || LA1_0 == '-' || (LA1_0 >= '0' && LA1_0 <= '9') || (LA1_0 >= 'A' && LA1_0 <= 'Z') || LA1_0 == '_' || (LA1_0 >= 'a' && LA1_0 <= 'z'))) {

-						alt1 = 1;

-					}

-

-

-					switch (alt1) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:

-					{

-						if ((input.LA(1) >= '(' && input.LA(1) <= ')') || 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 loop1;

-					}

-				} while (true);

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_NAMERULE"

-

-	// $ANTLR start "RULE_INTEGER_VALUE"

-	public final void mRULE_INTEGER_VALUE() throws RecognitionException {

-		try {

-			int _type = RULE_INTEGER_VALUE;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:20: ( ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' .. '1' ( ( '_' )?

-			// '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:22: ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' .. '1' ( ( '_' )?

-			// '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:22: ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' .. '1' ( ( '_'

-				// )? '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* )

-				int alt14 = 4;

-				int LA14_0 = input.LA(1);

-

-				if ((LA14_0 == '0')) {

-					switch (input.LA(2)) {

-					case 'B':

-					case 'b': {

-						alt14 = 2;

-					}

-						break;

-					case 'X':

-					case 'x': {

-						alt14 = 3;

-					}

-						break;

-					case '0':

-					case '1':

-					case '2':

-					case '3':

-					case '4':

-					case '5':

-					case '6':

-					case '7':

-					case '_': {

-						alt14 = 4;

-					}

-						break;

-					default:

-						alt14 = 1;

-					}

-

-				}

-				else if (((LA14_0 >= '1' && LA14_0 <= '9'))) {

-					alt14 = 1;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 14, 0, input);

-

-					throw nvae;

-				}

-				switch (alt14) {

-				case 1:

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:23: ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* )

-				{

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:23: ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* )

-					int alt4 = 2;

-					int LA4_0 = input.LA(1);

-

-					if ((LA4_0 == '0')) {

-						alt4 = 1;

-					}

-					else if (((LA4_0 >= '1' && LA4_0 <= '9'))) {

-						alt4 = 2;

-					}

-					else {

-						NoViableAltException nvae =

-								new NoViableAltException("", 4, 0, input);

-

-						throw nvae;

-					}

-					switch (alt4) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:24: '0'

-					{

-						match('0');

-

-					}

-						break;

-					case 2:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:28: '1' .. '9' ( ( '_' )? '0' .. '9' )*

-					{

-						matchRange('1', '9');

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:37: ( ( '_' )? '0' .. '9' )*

-						loop3: do {

-							int alt3 = 2;

-							int LA3_0 = input.LA(1);

-

-							if (((LA3_0 >= '0' && LA3_0 <= '9') || LA3_0 == '_')) {

-								alt3 = 1;

-							}

-

-

-							switch (alt3) {

-							case 1:

-							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:38: ( '_' )? '0' .. '9'

-							{

-								// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:38: ( '_' )?

-								int alt2 = 2;

-								int LA2_0 = input.LA(1);

-

-								if ((LA2_0 == '_')) {

-									alt2 = 1;

-								}

-								switch (alt2) {

-								case 1:

-								// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:38: '_'

-								{

-									match('_');

-

-								}

-									break;

-

-								}

-

-								matchRange('0', '9');

-

-							}

-								break;

-

-							default:

-								break loop3;

-							}

-						} while (true);

-

-

-					}

-						break;

-

-					}

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:55: ( '0b' | '0B' ) '0' .. '1' ( ( '_' )? '0' .. '1' )*

-				{

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:55: ( '0b' | '0B' )

-					int alt5 = 2;

-					int LA5_0 = input.LA(1);

-

-					if ((LA5_0 == '0')) {

-						int LA5_1 = input.LA(2);

-

-						if ((LA5_1 == 'b')) {

-							alt5 = 1;

-						}

-						else if ((LA5_1 == 'B')) {

-							alt5 = 2;

-						}

-						else {

-							NoViableAltException nvae =

-									new NoViableAltException("", 5, 1, input);

-

-							throw nvae;

-						}

-					}

-					else {

-						NoViableAltException nvae =

-								new NoViableAltException("", 5, 0, input);

-

-						throw nvae;

-					}

-					switch (alt5) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:56: '0b'

-					{

-						match("0b");

-

-

-					}

-						break;

-					case 2:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:61: '0B'

-					{

-						match("0B");

-

-

-					}

-						break;

-

-					}

-

-					matchRange('0', '1');

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:76: ( ( '_' )? '0' .. '1' )*

-					loop7: do {

-						int alt7 = 2;

-						int LA7_0 = input.LA(1);

-

-						if (((LA7_0 >= '0' && LA7_0 <= '1') || LA7_0 == '_')) {

-							alt7 = 1;

-						}

-

-

-						switch (alt7) {

-						case 1:

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:77: ( '_' )? '0' .. '1'

-						{

-							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:77: ( '_' )?

-							int alt6 = 2;

-							int LA6_0 = input.LA(1);

-

-							if ((LA6_0 == '_')) {

-								alt6 = 1;

-							}

-							switch (alt6) {

-							case 1:

-							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:77: '_'

-							{

-								match('_');

-

-							}

-								break;

-

-							}

-

-							matchRange('0', '1');

-

-						}

-							break;

-

-						default:

-							break loop7;

-						}

-					} while (true);

-

-

-				}

-					break;

-				case 3:

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:93: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' |

-				// 'a' .. 'f' | 'A' .. 'F' ) )*

-				{

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:93: ( '0x' | '0X' )

-					int alt8 = 2;

-					int LA8_0 = input.LA(1);

-

-					if ((LA8_0 == '0')) {

-						int LA8_1 = input.LA(2);

-

-						if ((LA8_1 == 'x')) {

-							alt8 = 1;

-						}

-						else if ((LA8_1 == 'X')) {

-							alt8 = 2;

-						}

-						else {

-							NoViableAltException nvae =

-									new NoViableAltException("", 8, 1, input);

-

-							throw nvae;

-						}

-					}

-					else {

-						NoViableAltException nvae =

-								new NoViableAltException("", 8, 0, input);

-

-						throw nvae;

-					}

-					switch (alt8) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:94: '0x'

-					{

-						match("0x");

-

-

-					}

-						break;

-					case 2:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:99: '0X'

-					{

-						match("0X");

-

-

-					}

-						break;

-

-					}

-

-					if ((input.LA(1) >= '0' && input.LA(1) <= '9') || (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;

-					}

-

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:134: ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )*

-					loop10: do {

-						int alt10 = 2;

-						int LA10_0 = input.LA(1);

-

-						if (((LA10_0 >= '0' && LA10_0 <= '9') || (LA10_0 >= 'A' && LA10_0 <= 'F') || LA10_0 == '_' || (LA10_0 >= 'a' && LA10_0 <= 'f'))) {

-							alt10 = 1;

-						}

-

-

-						switch (alt10) {

-						case 1:

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:135: ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )

-						{

-							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:135: ( '_' )?

-							int alt9 = 2;

-							int LA9_0 = input.LA(1);

-

-							if ((LA9_0 == '_')) {

-								alt9 = 1;

-							}

-							switch (alt9) {

-							case 1:

-							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:135: '_'

-							{

-								match('_');

-

-							}

-								break;

-

-							}

-

-							if ((input.LA(1) >= '0' && input.LA(1) <= '9') || (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;

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop10;

-						}

-					} while (true);

-

-

-				}

-					break;

-				case 4:

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:171: '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )*

-				{

-					match('0');

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:175: ( '_' )?

-					int alt11 = 2;

-					int LA11_0 = input.LA(1);

-

-					if ((LA11_0 == '_')) {

-						alt11 = 1;

-					}

-					switch (alt11) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:175: '_'

-					{

-						match('_');

-

-					}

-						break;

-

-					}

-

-					matchRange('0', '7');

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:189: ( ( '_' )? '0' .. '7' )*

-					loop13: do {

-						int alt13 = 2;

-						int LA13_0 = input.LA(1);

-

-						if (((LA13_0 >= '0' && LA13_0 <= '7') || LA13_0 == '_')) {

-							alt13 = 1;

-						}

-

-

-						switch (alt13) {

-						case 1:

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:190: ( '_' )? '0' .. '7'

-						{

-							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:190: ( '_' )?

-							int alt12 = 2;

-							int LA12_0 = input.LA(1);

-

-							if ((LA12_0 == '_')) {

-								alt12 = 1;

-							}

-							switch (alt12) {

-							case 1:

-							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:190: '_'

-							{

-								match('_');

-

-							}

-								break;

-

-							}

-

-							matchRange('0', '7');

-

-						}

-							break;

-

-						default:

-							break loop13;

-						}

-					} while (true);

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_INTEGER_VALUE"

-

-	// $ANTLR start "RULE_ID"

-	public final void mRULE_ID() throws RecognitionException {

-		try {

-			int _type = RULE_ID;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:9: ( ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* |

-			// '\\'' ( options {greedy=false; } : . )* '\\'' ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:11: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* |

-			// '\\'' ( options {greedy=false; } : . )* '\\'' )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:11: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* |

-				// '\\'' ( options {greedy=false; } : . )* '\\'' )

-				int alt17 = 2;

-				int LA17_0 = input.LA(1);

-

-				if (((LA17_0 >= 'A' && LA17_0 <= 'Z') || LA17_0 == '_' || (LA17_0 >= 'a' && LA17_0 <= 'z'))) {

-					alt17 = 1;

-				}

-				else if ((LA17_0 == '\'')) {

-					alt17 = 2;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 17, 0, input);

-

-					throw nvae;

-				}

-				switch (alt17) {

-				case 1:

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:12: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*

-				{

-					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.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:36: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*

-					loop15: do {

-						int alt15 = 2;

-						int LA15_0 = input.LA(1);

-

-						if (((LA15_0 >= '0' && LA15_0 <= '9') || (LA15_0 >= 'A' && LA15_0 <= 'Z') || LA15_0 == '_' || (LA15_0 >= 'a' && LA15_0 <= 'z'))) {

-							alt15 = 1;

-						}

-

-

-						switch (alt15) {

-						case 1:

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:

-						{

-							if ((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 loop15;

-						}

-					} while (true);

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:70: '\\'' ( options {greedy=false; } : . )* '\\''

-				{

-					match('\'');

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:75: ( options {greedy=false; } : . )*

-					loop16: do {

-						int alt16 = 2;

-						int LA16_0 = input.LA(1);

-

-						if ((LA16_0 == '\'')) {

-							alt16 = 2;

-						}

-						else if (((LA16_0 >= '\u0000' && LA16_0 <= '&') || (LA16_0 >= '(' && LA16_0 <= '\uFFFF'))) {

-							alt16 = 1;

-						}

-

-

-						switch (alt16) {

-						case 1:

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:103: .

-						{

-							matchAny();

-

-						}

-							break;

-

-						default:

-							break loop16;

-						}

-					} while (true);

-

-					match('\'');

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			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.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:296:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' |

-			// '\"' ) ) )* '\"' )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:296:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' |

-			// '\"' ) ) )* '\"'

-			{

-				match('\"');

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:296:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' |

-				// '\"' ) ) )*

-				loop18: do {

-					int alt18 = 3;

-					int LA18_0 = input.LA(1);

-

-					if ((LA18_0 == '\\')) {

-						alt18 = 1;

-					}

-					else if (((LA18_0 >= '\u0000' && LA18_0 <= '!') || (LA18_0 >= '#' && LA18_0 <= '[') || (LA18_0 >= ']' && LA18_0 <= '\uFFFF'))) {

-						alt18 = 2;

-					}

-

-

-					switch (alt18) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:296:20: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )

-					{

-						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.consume();

-

-						}

-						else {

-							MismatchedSetException mse = new MismatchedSetException(null, input);

-							recover(mse);

-							throw mse;

-						}

-

-

-					}

-						break;

-					case 2:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:296:61: ~ ( ( '\\\\' | '\"' ) )

-					{

-						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 loop18;

-					}

-				} while (true);

-

-				match('\"');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_STRING"

-

-	// $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.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:17: ( '/*' ~ ( '@' ) ( options {greedy=false; } : . )* '*/' )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:19: '/*' ~ ( '@' ) ( options {greedy=false; } : . )* '*/'

-			{

-				match("/*");

-

-				if ((input.LA(1) >= '\u0000' && input.LA(1) <= '?') || (input.LA(1) >= 'A' && input.LA(1) <= '\uFFFF')) {

-					input.consume();

-

-				}

-				else {

-					MismatchedSetException mse = new MismatchedSetException(null, input);

-					recover(mse);

-					throw mse;

-				}

-

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:31: ( options {greedy=false; } : . )*

-				loop19: do {

-					int alt19 = 2;

-					int LA19_0 = input.LA(1);

-

-					if ((LA19_0 == '*')) {

-						int LA19_1 = input.LA(2);

-

-						if ((LA19_1 == '/')) {

-							alt19 = 2;

-						}

-						else if (((LA19_1 >= '\u0000' && LA19_1 <= '.') || (LA19_1 >= '0' && LA19_1 <= '\uFFFF'))) {

-							alt19 = 1;

-						}

-

-

-					}

-					else if (((LA19_0 >= '\u0000' && LA19_0 <= ')') || (LA19_0 >= '+' && LA19_0 <= '\uFFFF'))) {

-						alt19 = 1;

-					}

-

-

-					switch (alt19) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:59: .

-					{

-						matchAny();

-

-					}

-						break;

-

-					default:

-						break loop19;

-					}

-				} while (true);

-

-				match("*/");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_ML_COMMENT"

-

-	// $ANTLR start "RULE_SL_COMMENT"

-	public final void mRULE_SL_COMMENT() throws RecognitionException {

-		try {

-			int _type = RULE_SL_COMMENT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:300:17: ( '//' (~ ( ( '\\n' | '\\r' | '@' ) ) )* ( ( '\\r' )? '\\n' )? )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:300:19: '//' (~ ( ( '\\n' | '\\r' | '@' ) ) )* ( ( '\\r' )? '\\n' )?

-			{

-				match("//");

-

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:300:24: (~ ( ( '\\n' | '\\r' | '@' ) ) )*

-				loop20: do {

-					int alt20 = 2;

-					int LA20_0 = input.LA(1);

-

-					if (((LA20_0 >= '\u0000' && LA20_0 <= '\t') || (LA20_0 >= '\u000B' && LA20_0 <= '\f') || (LA20_0 >= '\u000E' && LA20_0 <= '?') || (LA20_0 >= 'A' && LA20_0 <= '\uFFFF'))) {

-						alt20 = 1;

-					}

-

-

-					switch (alt20) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:300:24: ~ ( ( '\\n' | '\\r' | '@' ) )

-					{

-						if ((input.LA(1) >= '\u0000' && input.LA(1) <= '\t') || (input.LA(1) >= '\u000B' && input.LA(1) <= '\f') || (input.LA(1) >= '\u000E' && input.LA(1) <= '?') || (input.LA(1) >= 'A' && input.LA(1) <= '\uFFFF')) {

-							input.consume();

-

-						}

-						else {

-							MismatchedSetException mse = new MismatchedSetException(null, input);

-							recover(mse);

-							throw mse;

-						}

-

-

-					}

-						break;

-

-					default:

-						break loop20;

-					}

-				} while (true);

-

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:300:44: ( ( '\\r' )? '\\n' )?

-				int alt22 = 2;

-				int LA22_0 = input.LA(1);

-

-				if ((LA22_0 == '\n' || LA22_0 == '\r')) {

-					alt22 = 1;

-				}

-				switch (alt22) {

-				case 1:

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:300:45: ( '\\r' )? '\\n'

-				{

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:300:45: ( '\\r' )?

-					int alt21 = 2;

-					int LA21_0 = input.LA(1);

-

-					if ((LA21_0 == '\r')) {

-						alt21 = 1;

-					}

-					switch (alt21) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:300:45: '\\r'

-					{

-						match('\r');

-

-					}

-						break;

-

-					}

-

-					match('\n');

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_SL_COMMENT"

-

-	// $ANTLR start "RULE_INT"

-	public final void mRULE_INT() throws RecognitionException {

-		try {

-			int _type = RULE_INT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:10: ( ( '0' .. '9' )+ )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:12: ( '0' .. '9' )+

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:12: ( '0' .. '9' )+

-				int cnt23 = 0;

-				loop23: do {

-					int alt23 = 2;

-					int LA23_0 = input.LA(1);

-

-					if (((LA23_0 >= '0' && LA23_0 <= '9'))) {

-						alt23 = 1;

-					}

-

-

-					switch (alt23) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:13: '0' .. '9'

-					{

-						matchRange('0', '9');

-

-					}

-						break;

-

-					default:

-						if (cnt23 >= 1) {

-							break loop23;

-						}

-						EarlyExitException eee =

-								new EarlyExitException(23, input);

-						throw eee;

-					}

-					cnt23++;

-				} while (true);

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_INT"

-

-	// $ANTLR start "RULE_WS"

-	public final void mRULE_WS() throws RecognitionException {

-		try {

-			int _type = RULE_WS;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:304:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:304:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:304:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

-				int cnt24 = 0;

-				loop24: do {

-					int alt24 = 2;

-					int LA24_0 = input.LA(1);

-

-					if (((LA24_0 >= '\t' && LA24_0 <= '\n') || LA24_0 == '\r' || LA24_0 == ' ')) {

-						alt24 = 1;

-					}

-

-

-					switch (alt24) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.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 (cnt24 >= 1) {

-							break loop24;

-						}

-						EarlyExitException eee =

-								new EarlyExitException(24, input);

-						throw eee;

-					}

-					cnt24++;

-				} 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.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:306:16: ( . )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:306:18: .

-			{

-				matchAny();

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_ANY_OTHER"

-

-	@Override

-	public void mTokens() throws RecognitionException {

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | RULE_NAMERULE | RULE_INTEGER_VALUE | RULE_ID |

-		// RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_INT | RULE_WS | RULE_ANY_OTHER )

-		int alt25 = 14;

-		alt25 = dfa25.predict(input);

-		switch (alt25) {

-		case 1:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:10: T__13

-		{

-			mT__13();

-

-		}

-			break;

-		case 2:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:16: T__14

-		{

-			mT__14();

-

-		}

-			break;

-		case 3:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:22: T__15

-		{

-			mT__15();

-

-		}

-			break;

-		case 4:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:28: T__16

-		{

-			mT__16();

-

-		}

-			break;

-		case 5:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:34: T__17

-		{

-			mT__17();

-

-		}

-			break;

-		case 6:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:40: RULE_NAMERULE

-		{

-			mRULE_NAMERULE();

-

-		}

-			break;

-		case 7:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:54: RULE_INTEGER_VALUE

-		{

-			mRULE_INTEGER_VALUE();

-

-		}

-			break;

-		case 8:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:73: RULE_ID

-		{

-			mRULE_ID();

-

-		}

-			break;

-		case 9:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:81: RULE_STRING

-		{

-			mRULE_STRING();

-

-		}

-			break;

-		case 10:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:93: RULE_ML_COMMENT

-		{

-			mRULE_ML_COMMENT();

-

-		}

-			break;

-		case 11:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:109: RULE_SL_COMMENT

-		{

-			mRULE_SL_COMMENT();

-

-		}

-			break;

-		case 12:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:125: RULE_INT

-		{

-			mRULE_INT();

-

-		}

-			break;

-		case 13:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:134: RULE_WS

-		{

-			mRULE_WS();

-

-		}

-			break;

-		case 14:

-		// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:142: RULE_ANY_OTHER

-		{

-			mRULE_ANY_OTHER();

-

-		}

-			break;

-

-		}

-

-	}

-

-

-	protected DFA25 dfa25 = new DFA25(this);

-	static final String DFA25_eotS =

-			"\6\uffff\1\24\2\26\1\uffff\3\16\10\uffff\1\24\1\uffff\1\26\1\uffff" +

-					"\1\26\5\uffff\1\26";

-	static final String DFA25_eofS =

-			"\40\uffff";

-	static final String DFA25_minS =

-			"\1\0\5\uffff\3\60\1\uffff\2\0\1\52\10\uffff\1\60\1\uffff\1\60\1" +

-					"\uffff\1\60\5\uffff\1\60";

-	static final String DFA25_maxS =

-			"\1\uffff\5\uffff\1\172\2\71\1\uffff\2\uffff\1\57\10\uffff\1\172" +

-					"\1\uffff\1\71\1\uffff\1\71\5\uffff\1\71";

-	static final String DFA25_acceptS =

-			"\1\uffff\1\1\1\2\1\3\1\4\1\5\3\uffff\1\10\3\uffff\1\15\1\16\1\1" +

-					"\1\2\1\3\1\4\1\5\1\6\1\uffff\1\7\1\uffff\1\14\1\uffff\1\10\1\11" +

-					"\1\12\1\13\1\15\1\uffff";

-	static final String DFA25_specialS =

-			"\1\2\11\uffff\1\1\1\0\24\uffff}>";

-	static final String[] DFA25_transitionS = {

-			"\11\16\2\15\2\16\1\15\22\16\1\15\1\16\1\13\4\16\1\12\2\16\1" +

-					"\3\3\16\1\1\1\14\1\7\11\10\1\2\6\16\32\6\1\4\1\16\1\5\1\16\1" +

-					"\11\1\16\32\6\uff85\16",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25",

-			"\10\27\2\30",

-			"\12\31",

-			"",

-			"\0\32",

-			"\0\33",

-			"\1\34\4\uffff\1\35",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25",

-			"",

-			"\10\37\2\30",

-			"",

-			"\12\31",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"\10\37\2\30"

-	};

-

-	static final short[] DFA25_eot = DFA.unpackEncodedString(DFA25_eotS);

-	static final short[] DFA25_eof = DFA.unpackEncodedString(DFA25_eofS);

-	static final char[] DFA25_min = DFA.unpackEncodedStringToUnsignedChars(DFA25_minS);

-	static final char[] DFA25_max = DFA.unpackEncodedStringToUnsignedChars(DFA25_maxS);

-	static final short[] DFA25_accept = DFA.unpackEncodedString(DFA25_acceptS);

-	static final short[] DFA25_special = DFA.unpackEncodedString(DFA25_specialS);

-	static final short[][] DFA25_transition;

-

-	static {

-		int numStates = DFA25_transitionS.length;

-		DFA25_transition = new short[numStates][];

-		for (int i = 0; i < numStates; i++) {

-			DFA25_transition[i] = DFA.unpackEncodedString(DFA25_transitionS[i]);

-		}

-	}

-

-	class DFA25 extends DFA {

-

-		public DFA25(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 25;

-			this.eot = DFA25_eot;

-			this.eof = DFA25_eof;

-			this.min = DFA25_min;

-			this.max = DFA25_max;

-			this.accept = DFA25_accept;

-			this.special = DFA25_special;

-			this.transition = DFA25_transition;

-		}

-

-		@Override

-		public String getDescription() {

-			return "1:1: Tokens : ( T__13 | T__14 | T__15 | T__16 | T__17 | RULE_NAMERULE | RULE_INTEGER_VALUE | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_INT | 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 LA25_11 = input.LA(1);

-

-				s = -1;

-				if (((LA25_11 >= '\u0000' && LA25_11 <= '\uFFFF'))) {

-					s = 27;

-				} else {

-					s = 14;

-				}

-

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			case 1:

-				int LA25_10 = input.LA(1);

-

-				s = -1;

-				if (((LA25_10 >= '\u0000' && LA25_10 <= '\uFFFF'))) {

-					s = 26;

-				} else {

-					s = 14;

-				}

-

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			case 2:

-				int LA25_0 = input.LA(1);

-

-				s = -1;

-				if ((LA25_0 == '.')) {

-					s = 1;

-				}

-

-				else if ((LA25_0 == ':')) {

-					s = 2;

-				}

-

-				else if ((LA25_0 == '*')) {

-					s = 3;

-				}

-

-				else if ((LA25_0 == '[')) {

-					s = 4;

-				}

-

-				else if ((LA25_0 == ']')) {

-					s = 5;

-				}

-

-				else if (((LA25_0 >= 'A' && LA25_0 <= 'Z') || (LA25_0 >= 'a' && LA25_0 <= 'z'))) {

-					s = 6;

-				}

-

-				else if ((LA25_0 == '0')) {

-					s = 7;

-				}

-

-				else if (((LA25_0 >= '1' && LA25_0 <= '9'))) {

-					s = 8;

-				}

-

-				else if ((LA25_0 == '_')) {

-					s = 9;

-				}

-

-				else if ((LA25_0 == '\'')) {

-					s = 10;

-				}

-

-				else if ((LA25_0 == '\"')) {

-					s = 11;

-				}

-

-				else if ((LA25_0 == '/')) {

-					s = 12;

-				}

-

-				else if (((LA25_0 >= '\t' && LA25_0 <= '\n') || LA25_0 == '\r' || LA25_0 == ' ')) {

-					s = 13;

-				}

-

-				else if (((LA25_0 >= '\u0000' && LA25_0 <= '\b') || (LA25_0 >= '\u000B' && LA25_0 <= '\f') || (LA25_0 >= '\u000E' && LA25_0 <= '\u001F') || LA25_0 == '!' || (LA25_0 >= '#' && LA25_0 <= '&') || (LA25_0 >= '(' && LA25_0 <= ')')

-						|| (LA25_0 >= '+' && LA25_0 <= '-') || (LA25_0 >= ';' && LA25_0 <= '@') || LA25_0 == '\\' || LA25_0 == '^' || LA25_0 == '`' || (LA25_0 >= '{' && LA25_0 <= '\uFFFF'))) {

-					s = 14;

-				}

-

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			}

-			NoViableAltException nvae =

-					new NoViableAltException(getDescription(), 25, _s, input);

-			error(nvae);

-			throw nvae;

-		}

-	}

-

-

+package org.eclipse.papyrus.uml.textedit.message.xtext.parser.antlr.internal;
+
+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;
+// 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;
+
+@SuppressWarnings("all")
+public class InternalUmlMessageLexer extends Lexer {
+	public static final int RULE_ID = 6;
+	public static final int RULE_STRING = 7;
+	public static final int T__16 = 16;
+	public static final int T__15 = 15;
+	public static final int T__17 = 17;
+	public static final int T__14 = 14;
+	public static final int T__13 = 13;
+	public static final int RULE_ANY_OTHER = 12;
+	public static final int RULE_INT = 5;
+	public static final int RULE_INTEGER_VALUE = 10;
+	public static final int RULE_WS = 11;
+	public static final int RULE_SL_COMMENT = 9;
+	public static final int EOF = -1;
+	public static final int RULE_NAME_RULE = 4;
+	public static final int RULE_ML_COMMENT = 8;
+
+	// delegates
+	// delegators
+
+	public InternalUmlMessageLexer() {
+		;
+	}
+
+	public InternalUmlMessageLexer(CharStream input) {
+		this(input, new RecognizerSharedState());
+	}
+
+	public InternalUmlMessageLexer(CharStream input, RecognizerSharedState state) {
+		super(input, state);
+
+	}
+
+	@Override
+	public String getGrammarFileName() {
+		return "../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g";
+	}
+
+	// $ANTLR start "T__13"
+	public final void mT__13() throws RecognitionException {
+		try {
+			int _type = T__13;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:11:7: ( '.' )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:11:9: '.'
+			{
+				match('.');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__13"
+
+	// $ANTLR start "T__14"
+	public final void mT__14() throws RecognitionException {
+		try {
+			int _type = T__14;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:12:7: ( ':' )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:12:9: ':'
+			{
+				match(':');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__14"
+
+	// $ANTLR start "T__15"
+	public final void mT__15() throws RecognitionException {
+		try {
+			int _type = T__15;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:13:7: ( '*' )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:13:9: '*'
+			{
+				match('*');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__15"
+
+	// $ANTLR start "T__16"
+	public final void mT__16() throws RecognitionException {
+		try {
+			int _type = T__16;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:14:7: ( '[' )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:14:9: '['
+			{
+				match('[');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__16"
+
+	// $ANTLR start "T__17"
+	public final void mT__17() throws RecognitionException {
+		try {
+			int _type = T__17;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:15:7: ( ']' )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:15:9: ']'
+			{
+				match(']');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__17"
+
+	// $ANTLR start "RULE_NAME_RULE"
+	public final void mRULE_NAME_RULE() throws RecognitionException {
+		try {
+			int _type = RULE_NAME_RULE;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:290:16: ( ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' | '(' |
+			// ')' )* )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:290:18: ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' | '(' |
+			// ')' )*
+			{
+				if ((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;
+				}
+
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:290:38: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' | '(' | ')' )*
+				loop1: do {
+					int alt1 = 2;
+					int LA1_0 = input.LA(1);
+
+					if (((LA1_0 >= '(' && LA1_0 <= ')') || LA1_0 == '-' || (LA1_0 >= '0' && LA1_0 <= '9') || (LA1_0 >= 'A' && LA1_0 <= 'Z') || LA1_0 == '_' || (LA1_0 >= 'a' && LA1_0 <= 'z'))) {
+						alt1 = 1;
+					}
+
+
+					switch (alt1) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:
+					{
+						if ((input.LA(1) >= '(' && input.LA(1) <= ')') || 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 loop1;
+					}
+				} while (true);
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_NAME_RULE"
+
+	// $ANTLR start "RULE_ID"
+	public final void mRULE_ID() throws RecognitionException {
+		try {
+			int _type = RULE_ID;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:9: ( ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* |
+			// '\\'' ( options {greedy=false; } : . )* '\\'' ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:11: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* |
+			// '\\'' ( options {greedy=false; } : . )* '\\'' )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:11: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* |
+				// '\\'' ( options {greedy=false; } : . )* '\\'' )
+				int alt4 = 2;
+				int LA4_0 = input.LA(1);
+
+				if (((LA4_0 >= 'A' && LA4_0 <= 'Z') || LA4_0 == '_' || (LA4_0 >= 'a' && LA4_0 <= 'z'))) {
+					alt4 = 1;
+				} else if ((LA4_0 == '\'')) {
+					alt4 = 2;
+				} else {
+					NoViableAltException nvae = new NoViableAltException("", 4, 0, input);
+
+					throw nvae;
+				}
+				switch (alt4) {
+				case 1:
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:12: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+				{
+					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.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:36: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+					loop2: do {
+						int alt2 = 2;
+						int LA2_0 = input.LA(1);
+
+						if (((LA2_0 >= '0' && LA2_0 <= '9') || (LA2_0 >= 'A' && LA2_0 <= 'Z') || LA2_0 == '_' || (LA2_0 >= 'a' && LA2_0 <= 'z'))) {
+							alt2 = 1;
+						}
+
+
+						switch (alt2) {
+						case 1:
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:
+						{
+							if ((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 loop2;
+						}
+					} while (true);
+
+
+				}
+					break;
+				case 2:
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:70: '\\'' ( options {greedy=false; } : . )* '\\''
+				{
+					match('\'');
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:75: ( options {greedy=false; } : . )*
+					loop3: do {
+						int alt3 = 2;
+						int LA3_0 = input.LA(1);
+
+						if ((LA3_0 == '\'')) {
+							alt3 = 2;
+						} else if (((LA3_0 >= '\u0000' && LA3_0 <= '&') || (LA3_0 >= '(' && LA3_0 <= '\uFFFF'))) {
+							alt3 = 1;
+						}
+
+
+						switch (alt3) {
+						case 1:
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:103: .
+						{
+							matchAny();
+
+						}
+							break;
+
+						default:
+							break loop3;
+						}
+					} while (true);
+
+					match('\'');
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			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.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' |
+			// '\"' ) ) )* '\"' )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' |
+			// '\"' ) ) )* '\"'
+			{
+				match('\"');
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' |
+				// '\"' ) ) )*
+				loop5: do {
+					int alt5 = 3;
+					int LA5_0 = input.LA(1);
+
+					if ((LA5_0 == '\\')) {
+						alt5 = 1;
+					} else if (((LA5_0 >= '\u0000' && LA5_0 <= '!') || (LA5_0 >= '#' && LA5_0 <= '[') || (LA5_0 >= ']' && LA5_0 <= '\uFFFF'))) {
+						alt5 = 2;
+					}
+
+
+					switch (alt5) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:20: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+					{
+						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.consume();
+
+						} else {
+							MismatchedSetException mse = new MismatchedSetException(null, input);
+							recover(mse);
+							throw mse;
+						}
+
+
+					}
+						break;
+					case 2:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:61: ~ ( ( '\\\\' | '\"' ) )
+					{
+						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 loop5;
+					}
+				} while (true);
+
+				match('\"');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_STRING"
+
+	// $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.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:296:17: ( '/*' ~ ( '@' ) ( options {greedy=false; } : . )* '*/' )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:296:19: '/*' ~ ( '@' ) ( options {greedy=false; } : . )* '*/'
+			{
+				match("/*");
+
+				if ((input.LA(1) >= '\u0000' && input.LA(1) <= '?') || (input.LA(1) >= 'A' && input.LA(1) <= '\uFFFF')) {
+					input.consume();
+
+				} else {
+					MismatchedSetException mse = new MismatchedSetException(null, input);
+					recover(mse);
+					throw mse;
+				}
+
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:296:31: ( options {greedy=false; } : . )*
+				loop6: do {
+					int alt6 = 2;
+					int LA6_0 = input.LA(1);
+
+					if ((LA6_0 == '*')) {
+						int LA6_1 = input.LA(2);
+
+						if ((LA6_1 == '/')) {
+							alt6 = 2;
+						} else if (((LA6_1 >= '\u0000' && LA6_1 <= '.') || (LA6_1 >= '0' && LA6_1 <= '\uFFFF'))) {
+							alt6 = 1;
+						}
+
+
+					} else if (((LA6_0 >= '\u0000' && LA6_0 <= ')') || (LA6_0 >= '+' && LA6_0 <= '\uFFFF'))) {
+						alt6 = 1;
+					}
+
+
+					switch (alt6) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:296:59: .
+					{
+						matchAny();
+
+					}
+						break;
+
+					default:
+						break loop6;
+					}
+				} while (true);
+
+				match("*/");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_ML_COMMENT"
+
+	// $ANTLR start "RULE_SL_COMMENT"
+	public final void mRULE_SL_COMMENT() throws RecognitionException {
+		try {
+			int _type = RULE_SL_COMMENT;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:17: ( '//' (~ ( ( '\\n' | '\\r' | '@' ) ) )* ( ( '\\r' )? '\\n' )? )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:19: '//' (~ ( ( '\\n' | '\\r' | '@' ) ) )* ( ( '\\r' )? '\\n' )?
+			{
+				match("//");
+
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:24: (~ ( ( '\\n' | '\\r' | '@' ) ) )*
+				loop7: do {
+					int alt7 = 2;
+					int LA7_0 = input.LA(1);
+
+					if (((LA7_0 >= '\u0000' && LA7_0 <= '\t') || (LA7_0 >= '\u000B' && LA7_0 <= '\f') || (LA7_0 >= '\u000E' && LA7_0 <= '?') || (LA7_0 >= 'A' && LA7_0 <= '\uFFFF'))) {
+						alt7 = 1;
+					}
+
+
+					switch (alt7) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:24: ~ ( ( '\\n' | '\\r' | '@' ) )
+					{
+						if ((input.LA(1) >= '\u0000' && input.LA(1) <= '\t') || (input.LA(1) >= '\u000B' && input.LA(1) <= '\f') || (input.LA(1) >= '\u000E' && input.LA(1) <= '?') || (input.LA(1) >= 'A' && input.LA(1) <= '\uFFFF')) {
+							input.consume();
+
+						} else {
+							MismatchedSetException mse = new MismatchedSetException(null, input);
+							recover(mse);
+							throw mse;
+						}
+
+
+					}
+						break;
+
+					default:
+						break loop7;
+					}
+				} while (true);
+
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:44: ( ( '\\r' )? '\\n' )?
+				int alt9 = 2;
+				int LA9_0 = input.LA(1);
+
+				if ((LA9_0 == '\n' || LA9_0 == '\r')) {
+					alt9 = 1;
+				}
+				switch (alt9) {
+				case 1:
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:45: ( '\\r' )? '\\n'
+				{
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:45: ( '\\r' )?
+					int alt8 = 2;
+					int LA8_0 = input.LA(1);
+
+					if ((LA8_0 == '\r')) {
+						alt8 = 1;
+					}
+					switch (alt8) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:45: '\\r'
+					{
+						match('\r');
+
+					}
+						break;
+
+					}
+
+					match('\n');
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_SL_COMMENT"
+
+	// $ANTLR start "RULE_INT"
+	public final void mRULE_INT() throws RecognitionException {
+		try {
+			int _type = RULE_INT;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:300:10: ( ( '0' .. '9' )+ )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:300:12: ( '0' .. '9' )+
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:300:12: ( '0' .. '9' )+
+				int cnt10 = 0;
+				loop10: do {
+					int alt10 = 2;
+					int LA10_0 = input.LA(1);
+
+					if (((LA10_0 >= '0' && LA10_0 <= '9'))) {
+						alt10 = 1;
+					}
+
+
+					switch (alt10) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:300:13: '0' .. '9'
+					{
+						matchRange('0', '9');
+
+					}
+						break;
+
+					default:
+						if (cnt10 >= 1) {
+							break loop10;
+						}
+						EarlyExitException eee = new EarlyExitException(10, input);
+						throw eee;
+					}
+					cnt10++;
+				} while (true);
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_INT"
+
+	// $ANTLR start "RULE_INTEGER_VALUE"
+	public final void mRULE_INTEGER_VALUE() throws RecognitionException {
+		try {
+			int _type = RULE_INTEGER_VALUE;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:20: ( ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' .. '1' ( ( '_' )?
+			// '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:22: ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' .. '1' ( ( '_' )?
+			// '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:22: ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' .. '1' ( ( '_'
+				// )? '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* )
+				int alt23 = 4;
+				int LA23_0 = input.LA(1);
+
+				if ((LA23_0 == '0')) {
+					switch (input.LA(2)) {
+					case 'B':
+					case 'b': {
+						alt23 = 2;
+					}
+						break;
+					case 'X':
+					case 'x': {
+						alt23 = 3;
+					}
+						break;
+					case '0':
+					case '1':
+					case '2':
+					case '3':
+					case '4':
+					case '5':
+					case '6':
+					case '7':
+					case '_': {
+						alt23 = 4;
+					}
+						break;
+					default:
+						alt23 = 1;
+					}
+
+				} else if (((LA23_0 >= '1' && LA23_0 <= '9'))) {
+					alt23 = 1;
+				} else {
+					NoViableAltException nvae = new NoViableAltException("", 23, 0, input);
+
+					throw nvae;
+				}
+				switch (alt23) {
+				case 1:
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:23: ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* )
+				{
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:23: ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* )
+					int alt13 = 2;
+					int LA13_0 = input.LA(1);
+
+					if ((LA13_0 == '0')) {
+						alt13 = 1;
+					} else if (((LA13_0 >= '1' && LA13_0 <= '9'))) {
+						alt13 = 2;
+					} else {
+						NoViableAltException nvae = new NoViableAltException("", 13, 0, input);
+
+						throw nvae;
+					}
+					switch (alt13) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:24: '0'
+					{
+						match('0');
+
+					}
+						break;
+					case 2:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:28: '1' .. '9' ( ( '_' )? '0' .. '9' )*
+					{
+						matchRange('1', '9');
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:37: ( ( '_' )? '0' .. '9' )*
+						loop12: do {
+							int alt12 = 2;
+							int LA12_0 = input.LA(1);
+
+							if (((LA12_0 >= '0' && LA12_0 <= '9') || LA12_0 == '_')) {
+								alt12 = 1;
+							}
+
+
+							switch (alt12) {
+							case 1:
+								// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:38: ( '_' )? '0' .. '9'
+							{
+								// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:38: ( '_' )?
+								int alt11 = 2;
+								int LA11_0 = input.LA(1);
+
+								if ((LA11_0 == '_')) {
+									alt11 = 1;
+								}
+								switch (alt11) {
+								case 1:
+									// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:38: '_'
+								{
+									match('_');
+
+								}
+									break;
+
+								}
+
+								matchRange('0', '9');
+
+							}
+								break;
+
+							default:
+								break loop12;
+							}
+						} while (true);
+
+
+					}
+						break;
+
+					}
+
+
+				}
+					break;
+				case 2:
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:55: ( '0b' | '0B' ) '0' .. '1' ( ( '_' )? '0' .. '1' )*
+				{
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:55: ( '0b' | '0B' )
+					int alt14 = 2;
+					int LA14_0 = input.LA(1);
+
+					if ((LA14_0 == '0')) {
+						int LA14_1 = input.LA(2);
+
+						if ((LA14_1 == 'b')) {
+							alt14 = 1;
+						} else if ((LA14_1 == 'B')) {
+							alt14 = 2;
+						} else {
+							NoViableAltException nvae = new NoViableAltException("", 14, 1, input);
+
+							throw nvae;
+						}
+					} else {
+						NoViableAltException nvae = new NoViableAltException("", 14, 0, input);
+
+						throw nvae;
+					}
+					switch (alt14) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:56: '0b'
+					{
+						match("0b");
+
+
+					}
+						break;
+					case 2:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:61: '0B'
+					{
+						match("0B");
+
+
+					}
+						break;
+
+					}
+
+					matchRange('0', '1');
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:76: ( ( '_' )? '0' .. '1' )*
+					loop16: do {
+						int alt16 = 2;
+						int LA16_0 = input.LA(1);
+
+						if (((LA16_0 >= '0' && LA16_0 <= '1') || LA16_0 == '_')) {
+							alt16 = 1;
+						}
+
+
+						switch (alt16) {
+						case 1:
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:77: ( '_' )? '0' .. '1'
+						{
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:77: ( '_' )?
+							int alt15 = 2;
+							int LA15_0 = input.LA(1);
+
+							if ((LA15_0 == '_')) {
+								alt15 = 1;
+							}
+							switch (alt15) {
+							case 1:
+								// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:77: '_'
+							{
+								match('_');
+
+							}
+								break;
+
+							}
+
+							matchRange('0', '1');
+
+						}
+							break;
+
+						default:
+							break loop16;
+						}
+					} while (true);
+
+
+				}
+					break;
+				case 3:
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:93: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9'
+					// | 'a' .. 'f' | 'A' .. 'F' ) )*
+				{
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:93: ( '0x' | '0X' )
+					int alt17 = 2;
+					int LA17_0 = input.LA(1);
+
+					if ((LA17_0 == '0')) {
+						int LA17_1 = input.LA(2);
+
+						if ((LA17_1 == 'x')) {
+							alt17 = 1;
+						} else if ((LA17_1 == 'X')) {
+							alt17 = 2;
+						} else {
+							NoViableAltException nvae = new NoViableAltException("", 17, 1, input);
+
+							throw nvae;
+						}
+					} else {
+						NoViableAltException nvae = new NoViableAltException("", 17, 0, input);
+
+						throw nvae;
+					}
+					switch (alt17) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:94: '0x'
+					{
+						match("0x");
+
+
+					}
+						break;
+					case 2:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:99: '0X'
+					{
+						match("0X");
+
+
+					}
+						break;
+
+					}
+
+					if ((input.LA(1) >= '0' && input.LA(1) <= '9') || (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;
+					}
+
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:134: ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )*
+					loop19: do {
+						int alt19 = 2;
+						int LA19_0 = input.LA(1);
+
+						if (((LA19_0 >= '0' && LA19_0 <= '9') || (LA19_0 >= 'A' && LA19_0 <= 'F') || LA19_0 == '_' || (LA19_0 >= 'a' && LA19_0 <= 'f'))) {
+							alt19 = 1;
+						}
+
+
+						switch (alt19) {
+						case 1:
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:135: ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
+						{
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:135: ( '_' )?
+							int alt18 = 2;
+							int LA18_0 = input.LA(1);
+
+							if ((LA18_0 == '_')) {
+								alt18 = 1;
+							}
+							switch (alt18) {
+							case 1:
+								// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:135: '_'
+							{
+								match('_');
+
+							}
+								break;
+
+							}
+
+							if ((input.LA(1) >= '0' && input.LA(1) <= '9') || (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;
+							}
+
+
+						}
+							break;
+
+						default:
+							break loop19;
+						}
+					} while (true);
+
+
+				}
+					break;
+				case 4:
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:171: '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )*
+				{
+					match('0');
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:175: ( '_' )?
+					int alt20 = 2;
+					int LA20_0 = input.LA(1);
+
+					if ((LA20_0 == '_')) {
+						alt20 = 1;
+					}
+					switch (alt20) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:175: '_'
+					{
+						match('_');
+
+					}
+						break;
+
+					}
+
+					matchRange('0', '7');
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:189: ( ( '_' )? '0' .. '7' )*
+					loop22: do {
+						int alt22 = 2;
+						int LA22_0 = input.LA(1);
+
+						if (((LA22_0 >= '0' && LA22_0 <= '7') || LA22_0 == '_')) {
+							alt22 = 1;
+						}
+
+
+						switch (alt22) {
+						case 1:
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:190: ( '_' )? '0' .. '7'
+						{
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:190: ( '_' )?
+							int alt21 = 2;
+							int LA21_0 = input.LA(1);
+
+							if ((LA21_0 == '_')) {
+								alt21 = 1;
+							}
+							switch (alt21) {
+							case 1:
+								// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:190: '_'
+							{
+								match('_');
+
+							}
+								break;
+
+							}
+
+							matchRange('0', '7');
+
+						}
+							break;
+
+						default:
+							break loop22;
+						}
+					} while (true);
+
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_INTEGER_VALUE"
+
+	// $ANTLR start "RULE_WS"
+	public final void mRULE_WS() throws RecognitionException {
+		try {
+			int _type = RULE_WS;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:304:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:304:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:304:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+				int cnt24 = 0;
+				loop24: do {
+					int alt24 = 2;
+					int LA24_0 = input.LA(1);
+
+					if (((LA24_0 >= '\t' && LA24_0 <= '\n') || LA24_0 == '\r' || LA24_0 == ' ')) {
+						alt24 = 1;
+					}
+
+
+					switch (alt24) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.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 (cnt24 >= 1) {
+							break loop24;
+						}
+						EarlyExitException eee = new EarlyExitException(24, input);
+						throw eee;
+					}
+					cnt24++;
+				} 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.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:306:16: ( . )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:306:18: .
+			{
+				matchAny();
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_ANY_OTHER"
+
+	@Override
+	public void mTokens() throws RecognitionException {
+		// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | RULE_NAME_RULE | RULE_ID | RULE_STRING |
+		// RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_INT | RULE_INTEGER_VALUE | RULE_WS | RULE_ANY_OTHER )
+		int alt25 = 14;
+		alt25 = dfa25.predict(input);
+		switch (alt25) {
+		case 1:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:10: T__13
+		{
+			mT__13();
+
+		}
+			break;
+		case 2:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:16: T__14
+		{
+			mT__14();
+
+		}
+			break;
+		case 3:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:22: T__15
+		{
+			mT__15();
+
+		}
+			break;
+		case 4:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:28: T__16
+		{
+			mT__16();
+
+		}
+			break;
+		case 5:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:34: T__17
+		{
+			mT__17();
+
+		}
+			break;
+		case 6:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:40: RULE_NAME_RULE
+		{
+			mRULE_NAME_RULE();
+
+		}
+			break;
+		case 7:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:55: RULE_ID
+		{
+			mRULE_ID();
+
+		}
+			break;
+		case 8:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:63: RULE_STRING
+		{
+			mRULE_STRING();
+
+		}
+			break;
+		case 9:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:75: RULE_ML_COMMENT
+		{
+			mRULE_ML_COMMENT();
+
+		}
+			break;
+		case 10:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:91: RULE_SL_COMMENT
+		{
+			mRULE_SL_COMMENT();
+
+		}
+			break;
+		case 11:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:107: RULE_INT
+		{
+			mRULE_INT();
+
+		}
+			break;
+		case 12:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:116: RULE_INTEGER_VALUE
+		{
+			mRULE_INTEGER_VALUE();
+
+		}
+			break;
+		case 13:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:135: RULE_WS
+		{
+			mRULE_WS();
+
+		}
+			break;
+		case 14:
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:143: RULE_ANY_OTHER
+		{
+			mRULE_ANY_OTHER();
+
+		}
+			break;
+
+		}
+
+	}
+
+
+	protected DFA25 dfa25 = new DFA25(this);
+	static final String DFA25_eotS = "\6\uffff\1\25\1\uffff\3\16\2\33\7\uffff\1\25\7\uffff\2\33\1\uffff" + "\1\33";
+	static final String DFA25_eofS = "\40\uffff";
+	static final String DFA25_minS = "\1\0\5\uffff\1\60\1\uffff\2\0\1\52\2\60\7\uffff\1\60\7\uffff\2" + "\60\1\uffff\1\60";
+	static final String DFA25_maxS = "\1\uffff\5\uffff\1\172\1\uffff\2\uffff\1\57\1\170\1\137\7\uffff" + "\1\172\7\uffff\2\137\1\uffff\1\137";
+	static final String DFA25_acceptS = "\1\uffff\1\1\1\2\1\3\1\4\1\5\1\uffff\1\7\5\uffff\1\15\1\16\1\1" + "\1\2\1\3\1\4\1\5\1\uffff\1\6\1\7\1\10\1\11\1\12\1\14\1\13\2\uffff" + "\1\15\1\uffff";
+	static final String DFA25_specialS = "\1\2\7\uffff\1\1\1\0\26\uffff}>";
+	static final String[] DFA25_transitionS = {
+			"\11\16\2\15\2\16\1\15\22\16\1\15\1\16\1\11\4\16\1\10\2\16\1" + "\3\3\16\1\1\1\12\1\13\11\14\1\2\6\16\32\6\1\4\1\16\1\5\1\16" + "\1\7\1\16\32\6\uff85\16",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"\12\24\7\uffff\32\24\4\uffff\1\24\1\uffff\32\24",
+			"",
+			"\0\26",
+			"\0\27",
+			"\1\30\4\uffff\1\31",
+			"\10\34\12\uffff\1\32\25\uffff\1\32\6\uffff\1\32\2\uffff\1" + "\32\25\uffff\1\32",
+			"\12\35\45\uffff\1\32",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"\12\24\7\uffff\32\24\4\uffff\1\24\1\uffff\32\24",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"\10\37\47\uffff\1\32",
+			"\12\35\45\uffff\1\32",
+			"",
+			"\10\37\47\uffff\1\32" };
+
+	static final short[] DFA25_eot = DFA.unpackEncodedString(DFA25_eotS);
+	static final short[] DFA25_eof = DFA.unpackEncodedString(DFA25_eofS);
+	static final char[] DFA25_min = DFA.unpackEncodedStringToUnsignedChars(DFA25_minS);
+	static final char[] DFA25_max = DFA.unpackEncodedStringToUnsignedChars(DFA25_maxS);
+	static final short[] DFA25_accept = DFA.unpackEncodedString(DFA25_acceptS);
+	static final short[] DFA25_special = DFA.unpackEncodedString(DFA25_specialS);
+	static final short[][] DFA25_transition;
+
+	static {
+		int numStates = DFA25_transitionS.length;
+		DFA25_transition = new short[numStates][];
+		for (int i = 0; i < numStates; i++) {
+			DFA25_transition[i] = DFA.unpackEncodedString(DFA25_transitionS[i]);
+		}
+	}
+
+	class DFA25 extends DFA {
+
+		public DFA25(BaseRecognizer recognizer) {
+			this.recognizer = recognizer;
+			this.decisionNumber = 25;
+			this.eot = DFA25_eot;
+			this.eof = DFA25_eof;
+			this.min = DFA25_min;
+			this.max = DFA25_max;
+			this.accept = DFA25_accept;
+			this.special = DFA25_special;
+			this.transition = DFA25_transition;
+		}
+
+		@Override
+		public String getDescription() {
+			return "1:1: Tokens : ( T__13 | T__14 | T__15 | T__16 | T__17 | RULE_NAME_RULE | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_INT | RULE_INTEGER_VALUE | 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 LA25_9 = input.LA(1);
+
+				s = -1;
+				if (((LA25_9 >= '\u0000' && LA25_9 <= '\uFFFF'))) {
+					s = 23;
+				} else {
+					s = 14;
+				}
+
+				if (s >= 0) {
+					return s;
+				}
+				break;
+			case 1:
+				int LA25_8 = input.LA(1);
+
+				s = -1;
+				if (((LA25_8 >= '\u0000' && LA25_8 <= '\uFFFF'))) {
+					s = 22;
+				} else {
+					s = 14;
+				}
+
+				if (s >= 0) {
+					return s;
+				}
+				break;
+			case 2:
+				int LA25_0 = input.LA(1);
+
+				s = -1;
+				if ((LA25_0 == '.')) {
+					s = 1;
+				}
+
+				else if ((LA25_0 == ':')) {
+					s = 2;
+				}
+
+				else if ((LA25_0 == '*')) {
+					s = 3;
+				}
+
+				else if ((LA25_0 == '[')) {
+					s = 4;
+				}
+
+				else if ((LA25_0 == ']')) {
+					s = 5;
+				}
+
+				else if (((LA25_0 >= 'A' && LA25_0 <= 'Z') || (LA25_0 >= 'a' && LA25_0 <= 'z'))) {
+					s = 6;
+				}
+
+				else if ((LA25_0 == '_')) {
+					s = 7;
+				}
+
+				else if ((LA25_0 == '\'')) {
+					s = 8;
+				}
+
+				else if ((LA25_0 == '\"')) {
+					s = 9;
+				}
+
+				else if ((LA25_0 == '/')) {
+					s = 10;
+				}
+
+				else if ((LA25_0 == '0')) {
+					s = 11;
+				}
+
+				else if (((LA25_0 >= '1' && LA25_0 <= '9'))) {
+					s = 12;
+				}
+
+				else if (((LA25_0 >= '\t' && LA25_0 <= '\n') || LA25_0 == '\r' || LA25_0 == ' ')) {
+					s = 13;
+				}
+
+				else if (((LA25_0 >= '\u0000' && LA25_0 <= '\b') || (LA25_0 >= '\u000B' && LA25_0 <= '\f') || (LA25_0 >= '\u000E' && LA25_0 <= '\u001F') || LA25_0 == '!' || (LA25_0 >= '#' && LA25_0 <= '&') || (LA25_0 >= '(' && LA25_0 <= ')')
+						|| (LA25_0 >= '+' && LA25_0 <= '-') || (LA25_0 >= ';' && LA25_0 <= '@') || LA25_0 == '\\' || LA25_0 == '^' || LA25_0 == '`' || (LA25_0 >= '{' && LA25_0 <= '\uFFFF'))) {
+					s = 14;
+				}
+
+				if (s >= 0) {
+					return s;
+				}
+				break;
+			}
+			NoViableAltException nvae = new NoViableAltException(getDescription(), 25, _s, input);
+			error(nvae);
+			throw nvae;
+		}
+	}
+
+
 }
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessageParser.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessageParser.java
index 6cc74c8f0b1..a80654ad0e4 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessageParser.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessageParser.java
@@ -1,651 +1,641 @@
-package org.eclipse.papyrus.uml.textedit.message.xtext.parser.antlr.internal;

-

-import org.antlr.runtime.BitSet;

-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.ecore.EObject;

-import org.eclipse.papyrus.uml.textedit.message.xtext.services.UmlMessageGrammarAccess;

-import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;

-import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;

-

-@SuppressWarnings("all")

-public class InternalUmlMessageParser extends AbstractInternalAntlrParser {

-	public static final String[] tokenNames = new String[] {

-			"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_NAMERULE", "RULE_INT", "RULE_ID", "RULE_STRING", "RULE_INTEGER_VALUE", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'.'", "':'", "'*'", "'['", "']'"

-	};

-	public static final int RULE_NAMERULE = 4;

-	public static final int RULE_ID = 6;

-	public static final int RULE_STRING = 7;

-	public static final int T__16 = 16;

-	public static final int T__15 = 15;

-	public static final int T__17 = 17;

-	public static final int T__14 = 14;

-	public static final int T__13 = 13;

-	public static final int RULE_ANY_OTHER = 12;

-	public static final int RULE_INT = 5;

-	public static final int RULE_INTEGER_VALUE = 8;

-	public static final int RULE_WS = 11;

-	public static final int RULE_SL_COMMENT = 10;

-	public static final int EOF = -1;

-	public static final int RULE_ML_COMMENT = 9;

-

-	// delegates

-	// delegators

-

-

-	public InternalUmlMessageParser(TokenStream input) {

-		this(input, new RecognizerSharedState());

-	}

-

-	public InternalUmlMessageParser(TokenStream input, RecognizerSharedState state) {

-		super(input, state);

-

-	}

-

-

-	@Override

-	public String[] getTokenNames() {

-		return InternalUmlMessageParser.tokenNames;

-	}

-

-	@Override

-	public String getGrammarFileName() {

-		return "../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g";

-	}

-

-

-

-	private UmlMessageGrammarAccess grammarAccess;

-

-	public InternalUmlMessageParser(TokenStream input, UmlMessageGrammarAccess grammarAccess) {

-		this(input);

-		this.grammarAccess = grammarAccess;

-		registerRules(grammarAccess.getGrammar());

-	}

-

-	@Override

-	protected String getFirstRuleName() {

-		return "MessageRule";

-	}

-

-	@Override

-	protected UmlMessageGrammarAccess getGrammarAccess() {

-		return grammarAccess;

-	}

-

-

-

-	// $ANTLR start "entryRuleMessageRule"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:67:1: entryRuleMessageRule returns [EObject current=null] : iv_ruleMessageRule= ruleMessageRule EOF ;

-	public final EObject entryRuleMessageRule() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleMessageRule = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:68:2: (iv_ruleMessageRule= ruleMessageRule EOF )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:69:2: iv_ruleMessageRule= ruleMessageRule EOF

-			{

-				newCompositeNode(grammarAccess.getMessageRuleRule());

-				pushFollow(FOLLOW_ruleMessageRule_in_entryRuleMessageRule75);

-				iv_ruleMessageRule = ruleMessageRule();

-

-				state._fsp--;

-

-				current = iv_ruleMessageRule;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleMessageRule85);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleMessageRule"

-

-

-	// $ANTLR start "ruleMessageRule"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:76:1: ruleMessageRule returns [EObject current=null] : ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) )

-	// (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAMERULE ) ) ) ;

-	public final EObject ruleMessageRule() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_1 = null;

-		Token otherlv_3 = null;

-		Token lv_name_4_0 = null;

-		EObject lv_sequenceTerm_0_0 = null;

-

-		EObject lv_sequenceTerm_2_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:79:28: ( ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' (

-			// (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAMERULE ) ) ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:80:1: ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' ( (lv_sequenceTerm_2_0=

-			// ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAMERULE ) ) )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:80:1: ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' (

-				// (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAMERULE ) ) )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:80:2: ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' (

-				// (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAMERULE ) )

-				{

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:80:2: ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) )

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:81:1: (lv_sequenceTerm_0_0= ruleSequenceTermRule )

-					{

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:81:1: (lv_sequenceTerm_0_0= ruleSequenceTermRule )

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:82:3: lv_sequenceTerm_0_0= ruleSequenceTermRule

-						{

-

-							newCompositeNode(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_0_0());

-

-							pushFollow(FOLLOW_ruleSequenceTermRule_in_ruleMessageRule131);

-							lv_sequenceTerm_0_0 = ruleSequenceTermRule();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getMessageRuleRule());

-							}

-							add(

-									current,

-									"sequenceTerm",

-									lv_sequenceTerm_0_0,

-									"SequenceTermRule");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:98:2: (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )*

-					loop1: do {

-						int alt1 = 2;

-						int LA1_0 = input.LA(1);

-

-						if ((LA1_0 == 13)) {

-							alt1 = 1;

-						}

-

-

-						switch (alt1) {

-						case 1:

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:98:4: otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) )

-						{

-							otherlv_1 = (Token) match(input, 13, FOLLOW_13_in_ruleMessageRule144);

-

-							newLeafNode(otherlv_1, grammarAccess.getMessageRuleAccess().getFullStopKeyword_1_0());

-

-							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:102:1: ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) )

-							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:103:1: (lv_sequenceTerm_2_0= ruleSequenceTermRule )

-							{

-								// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:103:1: (lv_sequenceTerm_2_0= ruleSequenceTermRule )

-								// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:104:3: lv_sequenceTerm_2_0= ruleSequenceTermRule

-								{

-

-									newCompositeNode(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_1_1_0());

-

-									pushFollow(FOLLOW_ruleSequenceTermRule_in_ruleMessageRule165);

-									lv_sequenceTerm_2_0 = ruleSequenceTermRule();

-

-									state._fsp--;

-

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getMessageRuleRule());

-									}

-									add(

-											current,

-											"sequenceTerm",

-											lv_sequenceTerm_2_0,

-											"SequenceTermRule");

-									afterParserOrEnumRuleCall();

-

-

-								}

-

-

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop1;

-						}

-					} while (true);

-

-					otherlv_3 = (Token) match(input, 14, FOLLOW_14_in_ruleMessageRule179);

-

-					newLeafNode(otherlv_3, grammarAccess.getMessageRuleAccess().getColonKeyword_2());

-

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:124:1: ( (lv_name_4_0= RULE_NAMERULE ) )

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:125:1: (lv_name_4_0= RULE_NAMERULE )

-					{

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:125:1: (lv_name_4_0= RULE_NAMERULE )

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:126:3: lv_name_4_0= RULE_NAMERULE

-						{

-							lv_name_4_0 = (Token) match(input, RULE_NAMERULE, FOLLOW_RULE_NAMERULE_in_ruleMessageRule196);

-

-							newLeafNode(lv_name_4_0, grammarAccess.getMessageRuleAccess().getNameNameRuleTerminalRuleCall_3_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getMessageRuleRule());

-							}

-							setWithLastConsumed(

-									current,

-									"name",

-									lv_name_4_0,

-									"nameRule");

-

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleMessageRule"

-

-

-	// $ANTLR start "entryRuleSequenceTermRule"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:150:1: entryRuleSequenceTermRule returns [EObject current=null] : iv_ruleSequenceTermRule=

-	// ruleSequenceTermRule EOF ;

-	public final EObject entryRuleSequenceTermRule() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleSequenceTermRule = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:151:2: (iv_ruleSequenceTermRule= ruleSequenceTermRule EOF )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:152:2: iv_ruleSequenceTermRule= ruleSequenceTermRule EOF

-			{

-				newCompositeNode(grammarAccess.getSequenceTermRuleRule());

-				pushFollow(FOLLOW_ruleSequenceTermRule_in_entryRuleSequenceTermRule237);

-				iv_ruleSequenceTermRule = ruleSequenceTermRule();

-

-				state._fsp--;

-

-				current = iv_ruleSequenceTermRule;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleSequenceTermRule247);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleSequenceTermRule"

-

-

-	// $ANTLR start "ruleSequenceTermRule"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:159:1: ruleSequenceTermRule returns [EObject current=null] : ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) (

-	// (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? ) ;

-	public final EObject ruleSequenceTermRule() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_sequencialOrder_0_0 = null;

-		Token lv_sequenceName_1_0 = null;

-		AntlrDatatypeRuleToken lv_recurrence_2_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:162:28: ( ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? (

-			// (lv_recurrence_2_0= ruleRecurrenceRule ) )? ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:163:1: ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? (

-			// (lv_recurrence_2_0= ruleRecurrenceRule ) )? )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:163:1: ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? (

-				// (lv_recurrence_2_0= ruleRecurrenceRule ) )? )

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:163:2: ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? (

-				// (lv_recurrence_2_0= ruleRecurrenceRule ) )?

-				{

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:163:2: ( (lv_sequencialOrder_0_0= RULE_INT ) )

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:164:1: (lv_sequencialOrder_0_0= RULE_INT )

-					{

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:164:1: (lv_sequencialOrder_0_0= RULE_INT )

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:165:3: lv_sequencialOrder_0_0= RULE_INT

-						{

-							lv_sequencialOrder_0_0 = (Token) match(input, RULE_INT, FOLLOW_RULE_INT_in_ruleSequenceTermRule289);

-

-							newLeafNode(lv_sequencialOrder_0_0, grammarAccess.getSequenceTermRuleAccess().getSequencialOrderINTTerminalRuleCall_0_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getSequenceTermRuleRule());

-							}

-							setWithLastConsumed(

-									current,

-									"sequencialOrder",

-									lv_sequencialOrder_0_0,

-									"INT");

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:181:2: ( (lv_sequenceName_1_0= RULE_ID ) )?

-					int alt2 = 2;

-					int LA2_0 = input.LA(1);

-

-					if ((LA2_0 == RULE_ID)) {

-						alt2 = 1;

-					}

-					switch (alt2) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:182:1: (lv_sequenceName_1_0= RULE_ID )

-					{

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:182:1: (lv_sequenceName_1_0= RULE_ID )

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:183:3: lv_sequenceName_1_0= RULE_ID

-						{

-							lv_sequenceName_1_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleSequenceTermRule311);

-

-							newLeafNode(lv_sequenceName_1_0, grammarAccess.getSequenceTermRuleAccess().getSequenceNameIDTerminalRuleCall_1_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getSequenceTermRuleRule());

-							}

-							setWithLastConsumed(

-									current,

-									"sequenceName",

-									lv_sequenceName_1_0,

-									"ID");

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:199:3: ( (lv_recurrence_2_0= ruleRecurrenceRule ) )?

-					int alt3 = 2;

-					int LA3_0 = input.LA(1);

-

-					if (((LA3_0 >= 15 && LA3_0 <= 16))) {

-						alt3 = 1;

-					}

-					switch (alt3) {

-					case 1:

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:200:1: (lv_recurrence_2_0= ruleRecurrenceRule )

-					{

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:200:1: (lv_recurrence_2_0= ruleRecurrenceRule )

-						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:201:3: lv_recurrence_2_0= ruleRecurrenceRule

-						{

-

-							newCompositeNode(grammarAccess.getSequenceTermRuleAccess().getRecurrenceRecurrenceRuleParserRuleCall_2_0());

-

-							pushFollow(FOLLOW_ruleRecurrenceRule_in_ruleSequenceTermRule338);

-							lv_recurrence_2_0 = ruleRecurrenceRule();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getSequenceTermRuleRule());

-							}

-							set(

-									current,

-									"recurrence",

-									lv_recurrence_2_0,

-									"RecurrenceRule");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleSequenceTermRule"

-

-

-	// $ANTLR start "entryRuleRecurrenceRule"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:225:1: entryRuleRecurrenceRule returns [String current=null] : iv_ruleRecurrenceRule= ruleRecurrenceRule

-	// EOF ;

-	public final String entryRuleRecurrenceRule() throws RecognitionException {

-		String current = null;

-

-		AntlrDatatypeRuleToken iv_ruleRecurrenceRule = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:226:2: (iv_ruleRecurrenceRule= ruleRecurrenceRule EOF )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:227:2: iv_ruleRecurrenceRule= ruleRecurrenceRule EOF

-			{

-				newCompositeNode(grammarAccess.getRecurrenceRuleRule());

-				pushFollow(FOLLOW_ruleRecurrenceRule_in_entryRuleRecurrenceRule376);

-				iv_ruleRecurrenceRule = ruleRecurrenceRule();

-

-				state._fsp--;

-

-				current = iv_ruleRecurrenceRule.getText();

-				match(input, EOF, FOLLOW_EOF_in_entryRuleRecurrenceRule387);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleRecurrenceRule"

-

-

-	// $ANTLR start "ruleRecurrenceRule"

-	// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:234:1: ruleRecurrenceRule returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw=

-	// '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) ) ;

-	public final AntlrDatatypeRuleToken ruleRecurrenceRule() throws RecognitionException {

-		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

-

-		Token kw = null;

-		Token this_STRING_2 = null;

-		Token this_STRING_5 = null;

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:237:28: ( ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5=

-			// RULE_STRING kw= ']' ) ) )

-			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:238:1: ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5=

-			// RULE_STRING kw= ']' ) )

-			{

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:238:1: ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5=

-				// RULE_STRING kw= ']' ) )

-				int alt4 = 2;

-				int LA4_0 = input.LA(1);

-

-				if ((LA4_0 == 15)) {

-					alt4 = 1;

-				}

-				else if ((LA4_0 == 16)) {

-					alt4 = 2;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 4, 0, input);

-

-					throw nvae;

-				}

-				switch (alt4) {

-				case 1:

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:238:2: (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' )

-				{

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:238:2: (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' )

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:239:2: kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']'

-					{

-						kw = (Token) match(input, 15, FOLLOW_15_in_ruleRecurrenceRule426);

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getAsteriskKeyword_0_0());

-

-						kw = (Token) match(input, 16, FOLLOW_16_in_ruleRecurrenceRule439);

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_0_1());

-

-						this_STRING_2 = (Token) match(input, RULE_STRING, FOLLOW_RULE_STRING_in_ruleRecurrenceRule454);

-

-						current.merge(this_STRING_2);

-

-

-						newLeafNode(this_STRING_2, grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_0_2());

-

-						kw = (Token) match(input, 17, FOLLOW_17_in_ruleRecurrenceRule472);

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_0_3());

-

-

-					}

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:264:6: (kw= '[' this_STRING_5= RULE_STRING kw= ']' )

-				{

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:264:6: (kw= '[' this_STRING_5= RULE_STRING kw= ']' )

-					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:265:2: kw= '[' this_STRING_5= RULE_STRING kw= ']'

-					{

-						kw = (Token) match(input, 16, FOLLOW_16_in_ruleRecurrenceRule493);

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_1_0());

-

-						this_STRING_5 = (Token) match(input, RULE_STRING, FOLLOW_RULE_STRING_in_ruleRecurrenceRule508);

-

-						current.merge(this_STRING_5);

-

-

-						newLeafNode(this_STRING_5, grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_1_1());

-

-						kw = (Token) match(input, 17, FOLLOW_17_in_ruleRecurrenceRule526);

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_1_2());

-

-

-					}

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleRecurrenceRule"

-

-	// Delegated rules

-

-

-

-

-	public static final BitSet FOLLOW_ruleMessageRule_in_entryRuleMessageRule75 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleMessageRule85 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSequenceTermRule_in_ruleMessageRule131 = new BitSet(new long[] { 0x0000000000006000L });

-	public static final BitSet FOLLOW_13_in_ruleMessageRule144 = new BitSet(new long[] { 0x0000000000000020L });

-	public static final BitSet FOLLOW_ruleSequenceTermRule_in_ruleMessageRule165 = new BitSet(new long[] { 0x0000000000006000L });

-	public static final BitSet FOLLOW_14_in_ruleMessageRule179 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_RULE_NAMERULE_in_ruleMessageRule196 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSequenceTermRule_in_entryRuleSequenceTermRule237 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleSequenceTermRule247 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_INT_in_ruleSequenceTermRule289 = new BitSet(new long[] { 0x0000000000018042L });

-	public static final BitSet FOLLOW_RULE_ID_in_ruleSequenceTermRule311 = new BitSet(new long[] { 0x0000000000018002L });

-	public static final BitSet FOLLOW_ruleRecurrenceRule_in_ruleSequenceTermRule338 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleRecurrenceRule_in_entryRuleRecurrenceRule376 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleRecurrenceRule387 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_15_in_ruleRecurrenceRule426 = new BitSet(new long[] { 0x0000000000010000L });

-	public static final BitSet FOLLOW_16_in_ruleRecurrenceRule439 = new BitSet(new long[] { 0x0000000000000080L });

-	public static final BitSet FOLLOW_RULE_STRING_in_ruleRecurrenceRule454 = new BitSet(new long[] { 0x0000000000020000L });

-	public static final BitSet FOLLOW_17_in_ruleRecurrenceRule472 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_16_in_ruleRecurrenceRule493 = new BitSet(new long[] { 0x0000000000000080L });

-	public static final BitSet FOLLOW_RULE_STRING_in_ruleRecurrenceRule508 = new BitSet(new long[] { 0x0000000000020000L });

-	public static final BitSet FOLLOW_17_in_ruleRecurrenceRule526 = new BitSet(new long[] { 0x0000000000000002L });

-

+package org.eclipse.papyrus.uml.textedit.message.xtext.parser.antlr.internal;
+
+import org.antlr.runtime.BitSet;
+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.ecore.EObject;
+import org.eclipse.papyrus.uml.textedit.message.xtext.services.UmlMessageGrammarAccess;
+import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
+import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
+
+@SuppressWarnings("all")
+public class InternalUmlMessageParser extends AbstractInternalAntlrParser {
+	public static final String[] tokenNames = new String[] {
+			"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_NAME_RULE", "RULE_INT", "RULE_ID", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_INTEGER_VALUE", "RULE_WS", "RULE_ANY_OTHER", "'.'", "':'", "'*'", "'['", "']'" };
+	public static final int RULE_ID = 6;
+	public static final int RULE_STRING = 7;
+	public static final int T__16 = 16;
+	public static final int T__15 = 15;
+	public static final int T__17 = 17;
+	public static final int T__14 = 14;
+	public static final int T__13 = 13;
+	public static final int RULE_ANY_OTHER = 12;
+	public static final int RULE_INT = 5;
+	public static final int RULE_INTEGER_VALUE = 10;
+	public static final int RULE_WS = 11;
+	public static final int RULE_SL_COMMENT = 9;
+	public static final int EOF = -1;
+	public static final int RULE_NAME_RULE = 4;
+	public static final int RULE_ML_COMMENT = 8;
+
+	// delegates
+	// delegators
+
+
+	public InternalUmlMessageParser(TokenStream input) {
+		this(input, new RecognizerSharedState());
+	}
+
+	public InternalUmlMessageParser(TokenStream input, RecognizerSharedState state) {
+		super(input, state);
+
+	}
+
+
+	@Override
+	public String[] getTokenNames() {
+		return InternalUmlMessageParser.tokenNames;
+	}
+
+	@Override
+	public String getGrammarFileName() {
+		return "../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g";
+	}
+
+
+
+	private UmlMessageGrammarAccess grammarAccess;
+
+	public InternalUmlMessageParser(TokenStream input, UmlMessageGrammarAccess grammarAccess) {
+		this(input);
+		this.grammarAccess = grammarAccess;
+		registerRules(grammarAccess.getGrammar());
+	}
+
+	@Override
+	protected String getFirstRuleName() {
+		return "MessageRule";
+	}
+
+	@Override
+	protected UmlMessageGrammarAccess getGrammarAccess() {
+		return grammarAccess;
+	}
+
+
+
+	// $ANTLR start "entryRuleMessageRule"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:67:1: entryRuleMessageRule returns [EObject current=null] : iv_ruleMessageRule= ruleMessageRule EOF ;
+	public final EObject entryRuleMessageRule() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleMessageRule = null;
+
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:68:2: (iv_ruleMessageRule= ruleMessageRule EOF )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:69:2: iv_ruleMessageRule= ruleMessageRule EOF
+			{
+				newCompositeNode(grammarAccess.getMessageRuleRule());
+				pushFollow(FOLLOW_ruleMessageRule_in_entryRuleMessageRule75);
+				iv_ruleMessageRule = ruleMessageRule();
+
+				state._fsp--;
+
+				current = iv_ruleMessageRule;
+				match(input, EOF, FOLLOW_EOF_in_entryRuleMessageRule85);
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleMessageRule"
+
+
+	// $ANTLR start "ruleMessageRule"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:76:1: ruleMessageRule returns [EObject current=null] : ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) )
+	// (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAME_RULE ) ) ) ;
+	public final EObject ruleMessageRule() throws RecognitionException {
+		EObject current = null;
+
+		Token otherlv_1 = null;
+		Token otherlv_3 = null;
+		Token lv_name_4_0 = null;
+		EObject lv_sequenceTerm_0_0 = null;
+
+		EObject lv_sequenceTerm_2_0 = null;
+
+
+		enterRule();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:79:28: ( ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' (
+			// (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAME_RULE ) ) ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:80:1: ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' ( (lv_sequenceTerm_2_0=
+			// ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAME_RULE ) ) )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:80:1: ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' (
+				// (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAME_RULE ) ) )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:80:2: ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' (
+				// (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAME_RULE ) )
+				{
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:80:2: ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) )
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:81:1: (lv_sequenceTerm_0_0= ruleSequenceTermRule )
+					{
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:81:1: (lv_sequenceTerm_0_0= ruleSequenceTermRule )
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:82:3: lv_sequenceTerm_0_0= ruleSequenceTermRule
+						{
+
+							newCompositeNode(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_0_0());
+
+							pushFollow(FOLLOW_ruleSequenceTermRule_in_ruleMessageRule131);
+							lv_sequenceTerm_0_0 = ruleSequenceTermRule();
+
+							state._fsp--;
+
+
+							if (current == null) {
+								current = createModelElementForParent(grammarAccess.getMessageRuleRule());
+							}
+							add(
+									current,
+									"sequenceTerm",
+									lv_sequenceTerm_0_0,
+									"SequenceTermRule");
+							afterParserOrEnumRuleCall();
+
+
+						}
+
+
+					}
+
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:98:2: (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )*
+					loop1: do {
+						int alt1 = 2;
+						int LA1_0 = input.LA(1);
+
+						if ((LA1_0 == 13)) {
+							alt1 = 1;
+						}
+
+
+						switch (alt1) {
+						case 1:
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:98:4: otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) )
+						{
+							otherlv_1 = (Token) match(input, 13, FOLLOW_13_in_ruleMessageRule144);
+
+							newLeafNode(otherlv_1, grammarAccess.getMessageRuleAccess().getFullStopKeyword_1_0());
+
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:102:1: ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) )
+							// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:103:1: (lv_sequenceTerm_2_0= ruleSequenceTermRule )
+							{
+								// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:103:1: (lv_sequenceTerm_2_0= ruleSequenceTermRule )
+								// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:104:3: lv_sequenceTerm_2_0= ruleSequenceTermRule
+								{
+
+									newCompositeNode(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_1_1_0());
+
+									pushFollow(FOLLOW_ruleSequenceTermRule_in_ruleMessageRule165);
+									lv_sequenceTerm_2_0 = ruleSequenceTermRule();
+
+									state._fsp--;
+
+
+									if (current == null) {
+										current = createModelElementForParent(grammarAccess.getMessageRuleRule());
+									}
+									add(
+											current,
+											"sequenceTerm",
+											lv_sequenceTerm_2_0,
+											"SequenceTermRule");
+									afterParserOrEnumRuleCall();
+
+
+								}
+
+
+							}
+
+
+						}
+							break;
+
+						default:
+							break loop1;
+						}
+					} while (true);
+
+					otherlv_3 = (Token) match(input, 14, FOLLOW_14_in_ruleMessageRule179);
+
+					newLeafNode(otherlv_3, grammarAccess.getMessageRuleAccess().getColonKeyword_2());
+
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:124:1: ( (lv_name_4_0= RULE_NAME_RULE ) )
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:125:1: (lv_name_4_0= RULE_NAME_RULE )
+					{
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:125:1: (lv_name_4_0= RULE_NAME_RULE )
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:126:3: lv_name_4_0= RULE_NAME_RULE
+						{
+							lv_name_4_0 = (Token) match(input, RULE_NAME_RULE, FOLLOW_RULE_NAME_RULE_in_ruleMessageRule196);
+
+							newLeafNode(lv_name_4_0, grammarAccess.getMessageRuleAccess().getNameNAME_RULETerminalRuleCall_3_0());
+
+
+							if (current == null) {
+								current = createModelElement(grammarAccess.getMessageRuleRule());
+							}
+							setWithLastConsumed(
+									current,
+									"name",
+									lv_name_4_0,
+									"NAME_RULE");
+
+
+						}
+
+
+					}
+
+
+				}
+
+
+			}
+
+			leaveRule();
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleMessageRule"
+
+
+	// $ANTLR start "entryRuleSequenceTermRule"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:150:1: entryRuleSequenceTermRule returns [EObject current=null] : iv_ruleSequenceTermRule=
+	// ruleSequenceTermRule EOF ;
+	public final EObject entryRuleSequenceTermRule() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleSequenceTermRule = null;
+
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:151:2: (iv_ruleSequenceTermRule= ruleSequenceTermRule EOF )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:152:2: iv_ruleSequenceTermRule= ruleSequenceTermRule EOF
+			{
+				newCompositeNode(grammarAccess.getSequenceTermRuleRule());
+				pushFollow(FOLLOW_ruleSequenceTermRule_in_entryRuleSequenceTermRule237);
+				iv_ruleSequenceTermRule = ruleSequenceTermRule();
+
+				state._fsp--;
+
+				current = iv_ruleSequenceTermRule;
+				match(input, EOF, FOLLOW_EOF_in_entryRuleSequenceTermRule247);
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleSequenceTermRule"
+
+
+	// $ANTLR start "ruleSequenceTermRule"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:159:1: ruleSequenceTermRule returns [EObject current=null] : ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) (
+	// (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? ) ;
+	public final EObject ruleSequenceTermRule() throws RecognitionException {
+		EObject current = null;
+
+		Token lv_sequencialOrder_0_0 = null;
+		Token lv_sequenceName_1_0 = null;
+		AntlrDatatypeRuleToken lv_recurrence_2_0 = null;
+
+
+		enterRule();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:162:28: ( ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? (
+			// (lv_recurrence_2_0= ruleRecurrenceRule ) )? ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:163:1: ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? (
+			// (lv_recurrence_2_0= ruleRecurrenceRule ) )? )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:163:1: ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? (
+				// (lv_recurrence_2_0= ruleRecurrenceRule ) )? )
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:163:2: ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? (
+				// (lv_recurrence_2_0= ruleRecurrenceRule ) )?
+				{
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:163:2: ( (lv_sequencialOrder_0_0= RULE_INT ) )
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:164:1: (lv_sequencialOrder_0_0= RULE_INT )
+					{
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:164:1: (lv_sequencialOrder_0_0= RULE_INT )
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:165:3: lv_sequencialOrder_0_0= RULE_INT
+						{
+							lv_sequencialOrder_0_0 = (Token) match(input, RULE_INT, FOLLOW_RULE_INT_in_ruleSequenceTermRule289);
+
+							newLeafNode(lv_sequencialOrder_0_0, grammarAccess.getSequenceTermRuleAccess().getSequencialOrderINTTerminalRuleCall_0_0());
+
+
+							if (current == null) {
+								current = createModelElement(grammarAccess.getSequenceTermRuleRule());
+							}
+							setWithLastConsumed(
+									current,
+									"sequencialOrder",
+									lv_sequencialOrder_0_0,
+									"INT");
+
+
+						}
+
+
+					}
+
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:181:2: ( (lv_sequenceName_1_0= RULE_ID ) )?
+					int alt2 = 2;
+					int LA2_0 = input.LA(1);
+
+					if ((LA2_0 == RULE_ID)) {
+						alt2 = 1;
+					}
+					switch (alt2) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:182:1: (lv_sequenceName_1_0= RULE_ID )
+					{
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:182:1: (lv_sequenceName_1_0= RULE_ID )
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:183:3: lv_sequenceName_1_0= RULE_ID
+						{
+							lv_sequenceName_1_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleSequenceTermRule311);
+
+							newLeafNode(lv_sequenceName_1_0, grammarAccess.getSequenceTermRuleAccess().getSequenceNameIDTerminalRuleCall_1_0());
+
+
+							if (current == null) {
+								current = createModelElement(grammarAccess.getSequenceTermRuleRule());
+							}
+							setWithLastConsumed(
+									current,
+									"sequenceName",
+									lv_sequenceName_1_0,
+									"ID");
+
+
+						}
+
+
+					}
+						break;
+
+					}
+
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:199:3: ( (lv_recurrence_2_0= ruleRecurrenceRule ) )?
+					int alt3 = 2;
+					int LA3_0 = input.LA(1);
+
+					if (((LA3_0 >= 15 && LA3_0 <= 16))) {
+						alt3 = 1;
+					}
+					switch (alt3) {
+					case 1:
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:200:1: (lv_recurrence_2_0= ruleRecurrenceRule )
+					{
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:200:1: (lv_recurrence_2_0= ruleRecurrenceRule )
+						// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:201:3: lv_recurrence_2_0= ruleRecurrenceRule
+						{
+
+							newCompositeNode(grammarAccess.getSequenceTermRuleAccess().getRecurrenceRecurrenceRuleParserRuleCall_2_0());
+
+							pushFollow(FOLLOW_ruleRecurrenceRule_in_ruleSequenceTermRule338);
+							lv_recurrence_2_0 = ruleRecurrenceRule();
+
+							state._fsp--;
+
+
+							if (current == null) {
+								current = createModelElementForParent(grammarAccess.getSequenceTermRuleRule());
+							}
+							set(
+									current,
+									"recurrence",
+									lv_recurrence_2_0,
+									"RecurrenceRule");
+							afterParserOrEnumRuleCall();
+
+
+						}
+
+
+					}
+						break;
+
+					}
+
+
+				}
+
+
+			}
+
+			leaveRule();
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleSequenceTermRule"
+
+
+	// $ANTLR start "entryRuleRecurrenceRule"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:225:1: entryRuleRecurrenceRule returns [String current=null] : iv_ruleRecurrenceRule= ruleRecurrenceRule
+	// EOF ;
+	public final String entryRuleRecurrenceRule() throws RecognitionException {
+		String current = null;
+
+		AntlrDatatypeRuleToken iv_ruleRecurrenceRule = null;
+
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:226:2: (iv_ruleRecurrenceRule= ruleRecurrenceRule EOF )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:227:2: iv_ruleRecurrenceRule= ruleRecurrenceRule EOF
+			{
+				newCompositeNode(grammarAccess.getRecurrenceRuleRule());
+				pushFollow(FOLLOW_ruleRecurrenceRule_in_entryRuleRecurrenceRule376);
+				iv_ruleRecurrenceRule = ruleRecurrenceRule();
+
+				state._fsp--;
+
+				current = iv_ruleRecurrenceRule.getText();
+				match(input, EOF, FOLLOW_EOF_in_entryRuleRecurrenceRule387);
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleRecurrenceRule"
+
+
+	// $ANTLR start "ruleRecurrenceRule"
+	// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:234:1: ruleRecurrenceRule returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw=
+	// '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) ) ;
+	public final AntlrDatatypeRuleToken ruleRecurrenceRule() throws RecognitionException {
+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+		Token kw = null;
+		Token this_STRING_2 = null;
+		Token this_STRING_5 = null;
+
+		enterRule();
+
+		try {
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:237:28: ( ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5=
+			// RULE_STRING kw= ']' ) ) )
+			// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:238:1: ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5=
+			// RULE_STRING kw= ']' ) )
+			{
+				// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:238:1: ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5=
+				// RULE_STRING kw= ']' ) )
+				int alt4 = 2;
+				int LA4_0 = input.LA(1);
+
+				if ((LA4_0 == 15)) {
+					alt4 = 1;
+				} else if ((LA4_0 == 16)) {
+					alt4 = 2;
+				} else {
+					NoViableAltException nvae = new NoViableAltException("", 4, 0, input);
+
+					throw nvae;
+				}
+				switch (alt4) {
+				case 1:
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:238:2: (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' )
+				{
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:238:2: (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' )
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:239:2: kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']'
+					{
+						kw = (Token) match(input, 15, FOLLOW_15_in_ruleRecurrenceRule426);
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getAsteriskKeyword_0_0());
+
+						kw = (Token) match(input, 16, FOLLOW_16_in_ruleRecurrenceRule439);
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_0_1());
+
+						this_STRING_2 = (Token) match(input, RULE_STRING, FOLLOW_RULE_STRING_in_ruleRecurrenceRule454);
+
+						current.merge(this_STRING_2);
+
+
+						newLeafNode(this_STRING_2, grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_0_2());
+
+						kw = (Token) match(input, 17, FOLLOW_17_in_ruleRecurrenceRule472);
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_0_3());
+
+
+					}
+
+
+				}
+					break;
+				case 2:
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:264:6: (kw= '[' this_STRING_5= RULE_STRING kw= ']' )
+				{
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:264:6: (kw= '[' this_STRING_5= RULE_STRING kw= ']' )
+					// ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:265:2: kw= '[' this_STRING_5= RULE_STRING kw= ']'
+					{
+						kw = (Token) match(input, 16, FOLLOW_16_in_ruleRecurrenceRule493);
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_1_0());
+
+						this_STRING_5 = (Token) match(input, RULE_STRING, FOLLOW_RULE_STRING_in_ruleRecurrenceRule508);
+
+						current.merge(this_STRING_5);
+
+
+						newLeafNode(this_STRING_5, grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_1_1());
+
+						kw = (Token) match(input, 17, FOLLOW_17_in_ruleRecurrenceRule526);
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_1_2());
+
+
+					}
+
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			leaveRule();
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleRecurrenceRule"
+
+	// Delegated rules
+
+
+
+
+	public static final BitSet FOLLOW_ruleMessageRule_in_entryRuleMessageRule75 = new BitSet(new long[] { 0x0000000000000000L });
+	public static final BitSet FOLLOW_EOF_in_entryRuleMessageRule85 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_ruleSequenceTermRule_in_ruleMessageRule131 = new BitSet(new long[] { 0x0000000000006000L });
+	public static final BitSet FOLLOW_13_in_ruleMessageRule144 = new BitSet(new long[] { 0x0000000000000020L });
+	public static final BitSet FOLLOW_ruleSequenceTermRule_in_ruleMessageRule165 = new BitSet(new long[] { 0x0000000000006000L });
+	public static final BitSet FOLLOW_14_in_ruleMessageRule179 = new BitSet(new long[] { 0x0000000000000010L });
+	public static final BitSet FOLLOW_RULE_NAME_RULE_in_ruleMessageRule196 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_ruleSequenceTermRule_in_entryRuleSequenceTermRule237 = new BitSet(new long[] { 0x0000000000000000L });
+	public static final BitSet FOLLOW_EOF_in_entryRuleSequenceTermRule247 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_RULE_INT_in_ruleSequenceTermRule289 = new BitSet(new long[] { 0x0000000000018042L });
+	public static final BitSet FOLLOW_RULE_ID_in_ruleSequenceTermRule311 = new BitSet(new long[] { 0x0000000000018002L });
+	public static final BitSet FOLLOW_ruleRecurrenceRule_in_ruleSequenceTermRule338 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_ruleRecurrenceRule_in_entryRuleRecurrenceRule376 = new BitSet(new long[] { 0x0000000000000000L });
+	public static final BitSet FOLLOW_EOF_in_entryRuleRecurrenceRule387 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_15_in_ruleRecurrenceRule426 = new BitSet(new long[] { 0x0000000000010000L });
+	public static final BitSet FOLLOW_16_in_ruleRecurrenceRule439 = new BitSet(new long[] { 0x0000000000000080L });
+	public static final BitSet FOLLOW_RULE_STRING_in_ruleRecurrenceRule454 = new BitSet(new long[] { 0x0000000000020000L });
+	public static final BitSet FOLLOW_17_in_ruleRecurrenceRule472 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_16_in_ruleRecurrenceRule493 = new BitSet(new long[] { 0x0000000000000080L });
+	public static final BitSet FOLLOW_RULE_STRING_in_ruleRecurrenceRule508 = new BitSet(new long[] { 0x0000000000020000L });
+	public static final BitSet FOLLOW_17_in_ruleRecurrenceRule526 = new BitSet(new long[] { 0x0000000000000002L });
+
 }
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/serializer/UmlMessageSemanticSequencer.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/serializer/UmlMessageSemanticSequencer.java
index 8b027f1bda0..a45b2a7a83c 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/serializer/UmlMessageSemanticSequencer.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/serializer/UmlMessageSemanticSequencer.java
@@ -1,3 +1,6 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.papyrus.uml.textedit.message.xtext.serializer;
 
 import org.eclipse.emf.ecore.EObject;
@@ -20,19 +23,11 @@ public class UmlMessageSemanticSequencer extends AbstractDelegatingSemanticSeque
 		if (semanticObject.eClass().getEPackage() == UmlMessagePackage.eINSTANCE) {
 			switch (semanticObject.eClass().getClassifierID()) {
 			case UmlMessagePackage.MESSAGE_RULE:
-				if (context == grammarAccess.getMessageRuleRule()) {
-					sequence_MessageRule(context, (MessageRule) semanticObject);
-					return;
-				} else {
-					break;
-				}
+				sequence_MessageRule(context, (MessageRule) semanticObject);
+				return;
 			case UmlMessagePackage.SEQUENCE_TERM_RULE:
-				if (context == grammarAccess.getSequenceTermRuleRule()) {
-					sequence_SequenceTermRule(context, (SequenceTermRule) semanticObject);
-					return;
-				} else {
-					break;
-				}
+				sequence_SequenceTermRule(context, (SequenceTermRule) semanticObject);
+				return;
 			}
 		}
 		if (errorAcceptor != null) {
@@ -42,7 +37,7 @@ public class UmlMessageSemanticSequencer extends AbstractDelegatingSemanticSeque
 
 	/**
 	 * Constraint:
-	 * (sequenceTerm+=SequenceTermRule sequenceTerm+=SequenceTermRule* name=nameRule)
+	 * (sequenceTerm+=SequenceTermRule sequenceTerm+=SequenceTermRule* name=NAME_RULE)
 	 */
 	protected void sequence_MessageRule(EObject context, MessageRule semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/serializer/UmlMessageSyntacticSequencer.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/serializer/UmlMessageSyntacticSequencer.java
index a36ddb09160..535f2d4a493 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/serializer/UmlMessageSyntacticSequencer.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/serializer/UmlMessageSyntacticSequencer.java
@@ -1,3 +1,6 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.papyrus.uml.textedit.message.xtext.serializer;
 
 import java.util.List;
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/services/UmlMessageGrammarAccess.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/services/UmlMessageGrammarAccess.java
index f5f8a2e63ce..1d21bb68b36 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/services/UmlMessageGrammarAccess.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/services/UmlMessageGrammarAccess.java
@@ -36,17 +36,16 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cSequenceTermSequenceTermRuleParserRuleCall_1_1_0 = (RuleCall) cSequenceTermAssignment_1_1.eContents().get(0);
 		private final Keyword cColonKeyword_2 = (Keyword) cGroup.eContents().get(2);
 		private final Assignment cNameAssignment_3 = (Assignment) cGroup.eContents().get(3);
-		private final RuleCall cNameNameRuleTerminalRuleCall_3_0 = (RuleCall) cNameAssignment_3.eContents().get(0);
+		private final RuleCall cNameNAME_RULETerminalRuleCall_3_0 = (RuleCall) cNameAssignment_3.eContents().get(0);
 
 		// MessageRule:
-		//
-		// sequenceTerm+=SequenceTermRule ("." sequenceTerm+=SequenceTermRule)* ":" name=nameRule;
+		// sequenceTerm+=SequenceTermRule ("." sequenceTerm+=SequenceTermRule)* ":" name=NAME_RULE;
 		@Override
 		public ParserRule getRule() {
 			return rule;
 		}
 
-		// sequenceTerm+=SequenceTermRule ("." sequenceTerm+=SequenceTermRule)* ":" name=nameRule
+		// sequenceTerm+=SequenceTermRule ("." sequenceTerm+=SequenceTermRule)* ":" name=NAME_RULE
 		public Group getGroup() {
 			return cGroup;
 		}
@@ -86,14 +85,14 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder {
 			return cColonKeyword_2;
 		}
 
-		// name=nameRule
+		// name=NAME_RULE
 		public Assignment getNameAssignment_3() {
 			return cNameAssignment_3;
 		}
 
-		// nameRule
-		public RuleCall getNameNameRuleTerminalRuleCall_3_0() {
-			return cNameNameRuleTerminalRuleCall_3_0;
+		// NAME_RULE
+		public RuleCall getNameNAME_RULETerminalRuleCall_3_0() {
+			return cNameNAME_RULETerminalRuleCall_3_0;
 		}
 	}
 
@@ -107,17 +106,10 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder {
 		private final Assignment cRecurrenceAssignment_2 = (Assignment) cGroup.eContents().get(2);
 		private final RuleCall cRecurrenceRecurrenceRuleParserRuleCall_2_0 = (RuleCall) cRecurrenceAssignment_2.eContents().get(0);
 
-		// //('.' leftTerms += LeftSequenceTermRule)*
+		//// ('.' leftTerms += LeftSequenceTermRule)*
 		// SequenceTermRule:
-		//
 		// sequencialOrder= //represents the sequential order of the Message within the next higher level of procedural calling
-		//
-		//
-		// INT sequenceName=ID?
-		//
-		// // represents a concurrent thread of control. Messages that differ in the final name are concurrent at that level of nesting
-		//
-		//
+		// INT sequenceName=ID? // represents a concurrent thread of control. Messages that differ in the final name are concurrent at that level of nesting
 		// recurrence=RecurrenceRule? // The recurrence represents conditional or iterative execution.
 		// ;
 		@Override
@@ -126,27 +118,19 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder {
 		}
 
 		// sequencialOrder= //represents the sequential order of the Message within the next higher level of procedural calling
-		//
-		//
-		// INT sequenceName=ID?
-		//
-		// // represents a concurrent thread of control. Messages that differ in the final name are concurrent at that level of nesting
-		//
-		//
+		// INT sequenceName=ID? // represents a concurrent thread of control. Messages that differ in the final name are concurrent at that level of nesting
 		// recurrence=RecurrenceRule? // The recurrence represents conditional or iterative execution.
 		public Group getGroup() {
 			return cGroup;
 		}
 
 		// sequencialOrder= //represents the sequential order of the Message within the next higher level of procedural calling
-		//
-		//
 		// INT
 		public Assignment getSequencialOrderAssignment_0() {
 			return cSequencialOrderAssignment_0;
 		}
 
-		// //represents the sequential order of the Message within the next higher level of procedural calling
+		//// represents the sequential order of the Message within the next higher level of procedural calling
 		// INT
 		public RuleCall getSequencialOrderINTTerminalRuleCall_0_0() {
 			return cSequencialOrderINTTerminalRuleCall_0_0;
@@ -186,11 +170,9 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cSTRINGTerminalRuleCall_1_1 = (RuleCall) cGroup_1.eContents().get(1);
 		private final Keyword cRightSquareBracketKeyword_1_2 = (Keyword) cGroup_1.eContents().get(2);
 
-		// //terminal STRING :
-		// //( '\\' ('b'|'t'|'n'|'f'|'r'|'"'|"'"|'\\') | !('\\'|'"') )* ;
-		//
-		//
-		// / * messagename= sequenceterm ('.' sequenceterm)* (':' name);
+		//// terminal STRING :
+		//// ( '\\' ('b'|'t'|'n'|'f'|'r'|'"'|"'"|'\\') | !('\\'|'"') )* ;
+		/// * messagename= sequenceterm ('.' sequenceterm)* (':' name);
 		// terminal name:
 		// ('a'..'z'|'A'..'Z') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 		// terminal sequenceterm:
@@ -201,17 +183,27 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder {
 		// sequenceTerm1 = SequenceTermRule
 		// ('.' sequenceTerm2 = SequenceTermRule )*
 		//
-		// * /
-		//
-		// RecurrenceRule:
-		//
+		// * / RecurrenceRule:
 		// "*" "[" STRING "]" | "[" STRING "]";
 		@Override
 		public ParserRule getRule() {
 			return rule;
 		}
 
-		// "*" "[" STRING "]" | "[" STRING "]"
+		// "*" "[" STRING "]" //terminal STRING :
+		//// ( '\\' ('b'|'t'|'n'|'f'|'r'|'"'|"'"|'\\') | !('\\'|'"') )* ;
+		/// * messagename= sequenceterm ('.' sequenceterm)* (':' name);
+		// terminal name:
+		// ('a'..'z'|'A'..'Z') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
+		// terminal sequenceterm:
+		// (INT)(name)?(recurrence)?;
+		// terminal recurrence:
+		// ('*''[' STRING ']')|('[' STRING ']');
+		//
+		// sequenceTerm1 = SequenceTermRule
+		// ('.' sequenceTerm2 = SequenceTermRule )*
+		//
+		// * / | "[" STRING "]"
 		public Alternatives getAlternatives() {
 			return cAlternatives;
 		}
@@ -241,7 +233,20 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder {
 			return cRightSquareBracketKeyword_0_3;
 		}
 
-		// "[" STRING "]"
+		// "[" STRING "]" //terminal STRING :
+		//// ( '\\' ('b'|'t'|'n'|'f'|'r'|'"'|"'"|'\\') | !('\\'|'"') )* ;
+		/// * messagename= sequenceterm ('.' sequenceterm)* (':' name);
+		// terminal name:
+		// ('a'..'z'|'A'..'Z') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
+		// terminal sequenceterm:
+		// (INT)(name)?(recurrence)?;
+		// terminal recurrence:
+		// ('*''[' STRING ']')|('[' STRING ']');
+		//
+		// sequenceTerm1 = SequenceTermRule
+		// ('.' sequenceTerm2 = SequenceTermRule )*
+		//
+		// * /
 		public Group getGroup_1() {
 			return cGroup_1;
 		}
@@ -263,20 +268,24 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 
-	private MessageRuleElements pMessageRule;
-	private SequenceTermRuleElements pSequenceTermRule;
-	private TerminalRule tNameRule;
-	private RecurrenceRuleElements pRecurrenceRule;
+	private final MessageRuleElements pMessageRule;
+	private final SequenceTermRuleElements pSequenceTermRule;
+	private final TerminalRule tNAME_RULE;
+	private final RecurrenceRuleElements pRecurrenceRule;
 
 	private final Grammar grammar;
 
-	private CommonGrammarAccess gaCommon;
+	private final CommonGrammarAccess gaCommon;
 
 	@Inject
 	public UmlMessageGrammarAccess(GrammarProvider grammarProvider,
 			CommonGrammarAccess gaCommon) {
 		this.grammar = internalFindGrammar(grammarProvider);
 		this.gaCommon = gaCommon;
+		this.pMessageRule = new MessageRuleElements();
+		this.pSequenceTermRule = new SequenceTermRuleElements();
+		this.tNAME_RULE = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "NAME_RULE");
+		this.pRecurrenceRule = new RecurrenceRuleElements();
 	}
 
 	protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
@@ -295,7 +304,6 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder {
 		return grammar;
 	}
 
-
 	@Override
 	public Grammar getGrammar() {
 		return grammar;
@@ -308,49 +316,38 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder {
 
 
 	// MessageRule:
-	//
-	// sequenceTerm+=SequenceTermRule ("." sequenceTerm+=SequenceTermRule)* ":" name=nameRule;
+	// sequenceTerm+=SequenceTermRule ("." sequenceTerm+=SequenceTermRule)* ":" name=NAME_RULE;
 	public MessageRuleElements getMessageRuleAccess() {
-		return (pMessageRule != null) ? pMessageRule : (pMessageRule = new MessageRuleElements());
+		return pMessageRule;
 	}
 
 	public ParserRule getMessageRuleRule() {
 		return getMessageRuleAccess().getRule();
 	}
 
-	// //('.' leftTerms += LeftSequenceTermRule)*
+	//// ('.' leftTerms += LeftSequenceTermRule)*
 	// SequenceTermRule:
-	//
 	// sequencialOrder= //represents the sequential order of the Message within the next higher level of procedural calling
-	//
-	//
-	// INT sequenceName=ID?
-	//
-	// // represents a concurrent thread of control. Messages that differ in the final name are concurrent at that level of nesting
-	//
-	//
+	// INT sequenceName=ID? // represents a concurrent thread of control. Messages that differ in the final name are concurrent at that level of nesting
 	// recurrence=RecurrenceRule? // The recurrence represents conditional or iterative execution.
 	// ;
 	public SequenceTermRuleElements getSequenceTermRuleAccess() {
-		return (pSequenceTermRule != null) ? pSequenceTermRule : (pSequenceTermRule = new SequenceTermRuleElements());
+		return pSequenceTermRule;
 	}
 
 	public ParserRule getSequenceTermRuleRule() {
 		return getSequenceTermRuleAccess().getRule();
 	}
 
-	// terminal nameRule:
-	//
+	// terminal NAME_RULE:
 	// ("a".."z" | "A".."Z") ("a".."z" | "A".."Z" | "_" | "-" | "0".."9" | "(" | ")")*;
-	public TerminalRule getNameRuleRule() {
-		return (tNameRule != null) ? tNameRule : (tNameRule = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "nameRule"));
+	public TerminalRule getNAME_RULERule() {
+		return tNAME_RULE;
 	}
 
-	// //terminal STRING :
-	// //( '\\' ('b'|'t'|'n'|'f'|'r'|'"'|"'"|'\\') | !('\\'|'"') )* ;
-	//
-	//
-	// / * messagename= sequenceterm ('.' sequenceterm)* (':' name);
+	//// terminal STRING :
+	//// ( '\\' ('b'|'t'|'n'|'f'|'r'|'"'|"'"|'\\') | !('\\'|'"') )* ;
+	/// * messagename= sequenceterm ('.' sequenceterm)* (':' name);
 	// terminal name:
 	// ('a'..'z'|'A'..'Z') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 	// terminal sequenceterm:
@@ -361,92 +358,70 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder {
 	// sequenceTerm1 = SequenceTermRule
 	// ('.' sequenceTerm2 = SequenceTermRule )*
 	//
-	// * /
-	//
-	// RecurrenceRule:
-	//
+	// * / RecurrenceRule:
 	// "*" "[" STRING "]" | "[" STRING "]";
 	public RecurrenceRuleElements getRecurrenceRuleAccess() {
-		return (pRecurrenceRule != null) ? pRecurrenceRule : (pRecurrenceRule = new RecurrenceRuleElements());
+		return pRecurrenceRule;
 	}
 
 	public ParserRule getRecurrenceRuleRule() {
 		return getRecurrenceRuleAccess().getRule();
 	}
 
-	// terminal INTEGER_VALUE:
-	//
-	// ("0" | "1".."9" ("_"? "0".."9")*) //DECIMAL
-	//
-	// // BINARY
-	//
-	// // HEX
-	//
-	// // OCT
-	//
-	// | ("0b" | "0B") "0".."1" ("_"? "0".."1")* | ("0x" | "0X") ("0".."9" | "a".."f" | "A".."F") ("_"? ("0".."9" | "a".."f" |
-	//
-	// "A".."F"))* | "0" "_"? "0".."7" ("_"? "0".."7")*;
-	public TerminalRule getINTEGER_VALUERule() {
-		return gaCommon.getINTEGER_VALUERule();
-	}
-
 	// terminal ID:
-	//
 	// ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")* | "\'"->"\'";
 	public TerminalRule getIDRule() {
 		return gaCommon.getIDRule();
 	}
 
 	// terminal STRING:
-	//
 	// "\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"";
 	public TerminalRule getSTRINGRule() {
 		return gaCommon.getSTRINGRule();
 	}
 
 	// terminal ML_COMMENT:
-	//
 	// "/ *" !"@"->"* /";
 	public TerminalRule getML_COMMENTRule() {
 		return gaCommon.getML_COMMENTRule();
 	}
 
-	// //terminal DOUBLE_COLON : '::' ;
-	//
-	// //terminal IDENTIFIER : ID ;
-	//
-	// //terminal IDENTIFIER : ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')* | ('\'' -> '\'') ;
-	//
-	// //terminal DOCUMENTATION_COMMENT : '/ *' -> '* /' ;
-	//
-	// //terminal ML_COMMENT : '/°' -> '°/';
-	//
-	// //terminal SL_COMMENT : '°°' !('\n'|'\r')* ('\r'? '\n')?;
-	//
-	// //terminal WS : (' '|'\t'|'\r'|'\n')+; terminal SL_COMMENT:
-	//
+	// terminal SL_COMMENT:
 	// "//" !("\n" | "\r" | "@")* ("\r"? "\n")?;
 	public TerminalRule getSL_COMMENTRule() {
 		return gaCommon.getSL_COMMENTRule();
 	}
 
 	// terminal INT returns ecore::EInt:
-	//
 	// "0".."9"+;
 	public TerminalRule getINTRule() {
 		return gaCommon.getINTRule();
 	}
 
+	//// terminal DOUBLE_COLON : '::' ;
+	//// terminal IDENTIFIER : ID ;
+	//// terminal IDENTIFIER : ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')* | ('\'' -> '\'') ;
+	//// terminal DOCUMENTATION_COMMENT : '/ *' -> '* /' ;
+	//// terminal ML_COMMENT : '/�' -> '�/';
+	//// terminal SL_COMMENT : '��' !('\n'|'\r')* ('\r'? '\n')?;
+	//// terminal WS : (' '|'\t'|'\r'|'\n')+; terminal INTEGER_VALUE:
+	// ("0" | "1".."9" ("_"? "0".."9")*) //DECIMAL
+	// // BINARY
+	// // HEX
+	// // OCT
+	// | ("0b" | "0B") "0".."1" ("_"? "0".."1")* | ("0x" | "0X") ("0".."9" | "a".."f" | "A".."F") ("_"? ("0".."9" | "a".."f" |
+	// "A".."F"))* | "0" "_"? "0".."7" ("_"? "0".."7")*;
+	public TerminalRule getINTEGER_VALUERule() {
+		return gaCommon.getINTEGER_VALUERule();
+	}
+
 	// terminal WS:
-	//
 	// (" " | "\t" | "\r" | "\n")+;
 	public TerminalRule getWSRule() {
 		return gaCommon.getWSRule();
 	}
 
 	// terminal ANY_OTHER:
-	//
 	// .;
 	public TerminalRule getANY_OTHERRule() {
 		return gaCommon.getANY_OTHERRule();
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/MessageRule.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/MessageRule.java
index adfe686c28b..5f119c8eda1 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/MessageRule.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/MessageRule.java
@@ -1,71 +1,72 @@
-/**

- */

-package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage;

-

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

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Message Rule</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getSequenceTerm <em>Sequence Term</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getName <em>Name</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getMessageRule()

- * @model

- * @generated

- */

-public interface MessageRule extends EObject

-{

-	/**

-	 * Returns the value of the '<em><b>Sequence Term</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Sequence Term</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>Sequence Term</em>' containment reference list.

-	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getMessageRule_SequenceTerm()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<SequenceTermRule> getSequenceTerm();

-

-	/**

-	 * 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.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getMessageRule_Name()

-	 * @model

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#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);

-

-} // MessageRule

+/**
+ */
+package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Message Rule</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getSequenceTerm <em>Sequence Term</em>}</li>
+ * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getMessageRule()
+ * @model
+ * @generated
+ */
+public interface MessageRule extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Sequence Term</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Sequence Term</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>Sequence Term</em>' containment reference list.
+	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getMessageRule_SequenceTerm()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<SequenceTermRule> getSequenceTerm();
+
+	/**
+	 * 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.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getMessageRule_Name()
+	 * @model
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#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);
+
+} // MessageRule
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/SequenceTermRule.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/SequenceTermRule.java
index d3d9042ec8b..f89f92ffbcb 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/SequenceTermRule.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/SequenceTermRule.java
@@ -1,111 +1,113 @@
-/**

- */

-package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Sequence Term Rule</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequencialOrder <em>Sequencial Order</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequenceName <em>Sequence Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getRecurrence <em>Recurrence</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getSequenceTermRule()

- * @model

- * @generated

- */

-public interface SequenceTermRule extends EObject

-{

-	/**

-	 * Returns the value of the '<em><b>Sequencial Order</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Sequencial Order</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Sequencial Order</em>' attribute.

-	 * @see #setSequencialOrder(int)

-	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getSequenceTermRule_SequencialOrder()

-	 * @model

-	 * @generated

-	 */

-	int getSequencialOrder();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequencialOrder <em>Sequencial Order</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Sequencial Order</em>' attribute.

-	 * @see #getSequencialOrder()

-	 * @generated

-	 */

-	void setSequencialOrder(int value);

-

-	/**

-	 * Returns the value of the '<em><b>Sequence Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Sequence 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>Sequence Name</em>' attribute.

-	 * @see #setSequenceName(String)

-	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getSequenceTermRule_SequenceName()

-	 * @model

-	 * @generated

-	 */

-	String getSequenceName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequenceName <em>Sequence Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Sequence Name</em>' attribute.

-	 * @see #getSequenceName()

-	 * @generated

-	 */

-	void setSequenceName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Recurrence</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Recurrence</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Recurrence</em>' attribute.

-	 * @see #setRecurrence(String)

-	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getSequenceTermRule_Recurrence()

-	 * @model

-	 * @generated

-	 */

-	String getRecurrence();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getRecurrence <em>Recurrence</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Recurrence</em>' attribute.

-	 * @see #getRecurrence()

-	 * @generated

-	 */

-	void setRecurrence(String value);

-

-} // SequenceTermRule

+/**
+ */
+package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Sequence Term Rule</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequencialOrder <em>Sequencial Order</em>}</li>
+ * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequenceName <em>Sequence Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getRecurrence <em>Recurrence</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getSequenceTermRule()
+ * @model
+ * @generated
+ */
+public interface SequenceTermRule extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Sequencial Order</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Sequencial Order</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Sequencial Order</em>' attribute.
+	 * @see #setSequencialOrder(int)
+	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getSequenceTermRule_SequencialOrder()
+	 * @model
+	 * @generated
+	 */
+	int getSequencialOrder();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequencialOrder <em>Sequencial Order</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Sequencial Order</em>' attribute.
+	 * @see #getSequencialOrder()
+	 * @generated
+	 */
+	void setSequencialOrder(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Sequence Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Sequence 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>Sequence Name</em>' attribute.
+	 * @see #setSequenceName(String)
+	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getSequenceTermRule_SequenceName()
+	 * @model
+	 * @generated
+	 */
+	String getSequenceName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequenceName <em>Sequence Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Sequence Name</em>' attribute.
+	 * @see #getSequenceName()
+	 * @generated
+	 */
+	void setSequenceName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Recurrence</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Recurrence</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Recurrence</em>' attribute.
+	 * @see #setRecurrence(String)
+	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getSequenceTermRule_Recurrence()
+	 * @model
+	 * @generated
+	 */
+	String getRecurrence();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getRecurrence <em>Recurrence</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Recurrence</em>' attribute.
+	 * @see #getRecurrence()
+	 * @generated
+	 */
+	void setRecurrence(String value);
+
+} // SequenceTermRule
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/UmlMessageFactory.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/UmlMessageFactory.java
index 280a845c4df..c674a467b5e 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/UmlMessageFactory.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/UmlMessageFactory.java
@@ -1,57 +1,56 @@
-/**

- */

-package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage;

-

-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.uml.textedit.message.xtext.umlMessage.UmlMessagePackage

- * @generated

- */

-public interface UmlMessageFactory extends EFactory

-{

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	UmlMessageFactory eINSTANCE = org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessageFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Message Rule</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Message Rule</em>'.

-	 * @generated

-	 */

-	MessageRule createMessageRule();

-

-	/**

-	 * Returns a new object of class '<em>Sequence Term Rule</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Sequence Term Rule</em>'.

-	 * @generated

-	 */

-	SequenceTermRule createSequenceTermRule();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	UmlMessagePackage getUmlMessagePackage();

-

-} // UmlMessageFactory

+/**
+ */
+package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage;
+
+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.uml.textedit.message.xtext.umlMessage.UmlMessagePackage
+ * @generated
+ */
+public interface UmlMessageFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	UmlMessageFactory eINSTANCE = org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessageFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Message Rule</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Message Rule</em>'.
+	 * @generated
+	 */
+	MessageRule createMessageRule();
+
+	/**
+	 * Returns a new object of class '<em>Sequence Term Rule</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Sequence Term Rule</em>'.
+	 * @generated
+	 */
+	SequenceTermRule createSequenceTermRule();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	UmlMessagePackage getUmlMessagePackage();
+
+} // UmlMessageFactory
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/UmlMessagePackage.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/UmlMessagePackage.java
index 1889bdcfd03..5207db07e3a 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/UmlMessagePackage.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/UmlMessagePackage.java
@@ -1,333 +1,331 @@
-/**

- */

-package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage;

-

-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.uml.textedit.message.xtext.umlMessage.UmlMessageFactory

- * @model kind="package"

- * @generated

- */

-public interface UmlMessagePackage extends EPackage

-{

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "umlMessage";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/uml/textedit/message/xtext/UmlMessage";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "umlMessage";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	UmlMessagePackage eINSTANCE = org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessagePackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.MessageRuleImpl <em>Message Rule</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.MessageRuleImpl

-	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessagePackageImpl#getMessageRule()

-	 * @generated

-	 */

-	int MESSAGE_RULE = 0;

-

-	/**

-	 * The feature id for the '<em><b>Sequence Term</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MESSAGE_RULE__SEQUENCE_TERM = 0;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MESSAGE_RULE__NAME = 1;

-

-	/**

-	 * The number of structural features of the '<em>Message Rule</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MESSAGE_RULE_FEATURE_COUNT = 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl <em>Sequence Term Rule</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl

-	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessagePackageImpl#getSequenceTermRule()

-	 * @generated

-	 */

-	int SEQUENCE_TERM_RULE = 1;

-

-	/**

-	 * The feature id for the '<em><b>Sequencial Order</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER = 0;

-

-	/**

-	 * The feature id for the '<em><b>Sequence Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEQUENCE_TERM_RULE__SEQUENCE_NAME = 1;

-

-	/**

-	 * The feature id for the '<em><b>Recurrence</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEQUENCE_TERM_RULE__RECURRENCE = 2;

-

-	/**

-	 * The number of structural features of the '<em>Sequence Term Rule</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEQUENCE_TERM_RULE_FEATURE_COUNT = 3;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule <em>Message Rule</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Message Rule</em>'.

-	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule

-	 * @generated

-	 */

-	EClass getMessageRule();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getSequenceTerm <em>Sequence Term</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Sequence Term</em>'.

-	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getSequenceTerm()

-	 * @see #getMessageRule()

-	 * @generated

-	 */

-	EReference getMessageRule_SequenceTerm();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getName <em>Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getName()

-	 * @see #getMessageRule()

-	 * @generated

-	 */

-	EAttribute getMessageRule_Name();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule <em>Sequence Term Rule</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Sequence Term Rule</em>'.

-	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule

-	 * @generated

-	 */

-	EClass getSequenceTermRule();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequencialOrder <em>Sequencial Order</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Sequencial Order</em>'.

-	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequencialOrder()

-	 * @see #getSequenceTermRule()

-	 * @generated

-	 */

-	EAttribute getSequenceTermRule_SequencialOrder();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequenceName <em>Sequence Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Sequence Name</em>'.

-	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequenceName()

-	 * @see #getSequenceTermRule()

-	 * @generated

-	 */

-	EAttribute getSequenceTermRule_SequenceName();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getRecurrence <em>Recurrence</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Recurrence</em>'.

-	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getRecurrence()

-	 * @see #getSequenceTermRule()

-	 * @generated

-	 */

-	EAttribute getSequenceTermRule_Recurrence();

-

-	/**

-	 * 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

-	 */

-	UmlMessageFactory getUmlMessageFactory();

-

-	/**

-	 * <!-- 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.uml.textedit.message.xtext.umlMessage.impl.MessageRuleImpl <em>Message Rule</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.MessageRuleImpl

-		 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessagePackageImpl#getMessageRule()

-		 * @generated

-		 */

-		EClass MESSAGE_RULE = eINSTANCE.getMessageRule();

-

-		/**

-		 * The meta object literal for the '<em><b>Sequence Term</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference MESSAGE_RULE__SEQUENCE_TERM = eINSTANCE.getMessageRule_SequenceTerm();

-

-		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute MESSAGE_RULE__NAME = eINSTANCE.getMessageRule_Name();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl <em>Sequence Term Rule</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl

-		 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessagePackageImpl#getSequenceTermRule()

-		 * @generated

-		 */

-		EClass SEQUENCE_TERM_RULE = eINSTANCE.getSequenceTermRule();

-

-		/**

-		 * The meta object literal for the '<em><b>Sequencial Order</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER = eINSTANCE.getSequenceTermRule_SequencialOrder();

-

-		/**

-		 * The meta object literal for the '<em><b>Sequence Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute SEQUENCE_TERM_RULE__SEQUENCE_NAME = eINSTANCE.getSequenceTermRule_SequenceName();

-

-		/**

-		 * The meta object literal for the '<em><b>Recurrence</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute SEQUENCE_TERM_RULE__RECURRENCE = eINSTANCE.getSequenceTermRule_Recurrence();

-

-	}

-

-} // UmlMessagePackage

+/**
+ */
+package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage;
+
+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.uml.textedit.message.xtext.umlMessage.UmlMessageFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface UmlMessagePackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNAME = "umlMessage";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/uml/textedit/message/xtext/UmlMessage";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_PREFIX = "umlMessage";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	UmlMessagePackage eINSTANCE = org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessagePackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.MessageRuleImpl <em>Message Rule</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.MessageRuleImpl
+	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessagePackageImpl#getMessageRule()
+	 * @generated
+	 */
+	int MESSAGE_RULE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Sequence Term</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_RULE__SEQUENCE_TERM = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_RULE__NAME = 1;
+
+	/**
+	 * The number of structural features of the '<em>Message Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_RULE_FEATURE_COUNT = 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl <em>Sequence Term Rule</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl
+	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessagePackageImpl#getSequenceTermRule()
+	 * @generated
+	 */
+	int SEQUENCE_TERM_RULE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Sequencial Order</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER = 0;
+
+	/**
+	 * The feature id for the '<em><b>Sequence Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEQUENCE_TERM_RULE__SEQUENCE_NAME = 1;
+
+	/**
+	 * The feature id for the '<em><b>Recurrence</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEQUENCE_TERM_RULE__RECURRENCE = 2;
+
+	/**
+	 * The number of structural features of the '<em>Sequence Term Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEQUENCE_TERM_RULE_FEATURE_COUNT = 3;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule <em>Message Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Message Rule</em>'.
+	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule
+	 * @generated
+	 */
+	EClass getMessageRule();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getSequenceTerm <em>Sequence Term</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference list '<em>Sequence Term</em>'.
+	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getSequenceTerm()
+	 * @see #getMessageRule()
+	 * @generated
+	 */
+	EReference getMessageRule_SequenceTerm();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getName()
+	 * @see #getMessageRule()
+	 * @generated
+	 */
+	EAttribute getMessageRule_Name();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule <em>Sequence Term Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Sequence Term Rule</em>'.
+	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule
+	 * @generated
+	 */
+	EClass getSequenceTermRule();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequencialOrder <em>Sequencial Order</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Sequencial Order</em>'.
+	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequencialOrder()
+	 * @see #getSequenceTermRule()
+	 * @generated
+	 */
+	EAttribute getSequenceTermRule_SequencialOrder();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequenceName <em>Sequence Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Sequence Name</em>'.
+	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequenceName()
+	 * @see #getSequenceTermRule()
+	 * @generated
+	 */
+	EAttribute getSequenceTermRule_SequenceName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getRecurrence <em>Recurrence</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Recurrence</em>'.
+	 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getRecurrence()
+	 * @see #getSequenceTermRule()
+	 * @generated
+	 */
+	EAttribute getSequenceTermRule_Recurrence();
+
+	/**
+	 * 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
+	 */
+	UmlMessageFactory getUmlMessageFactory();
+
+	/**
+	 * <!-- 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.uml.textedit.message.xtext.umlMessage.impl.MessageRuleImpl <em>Message Rule</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.MessageRuleImpl
+		 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessagePackageImpl#getMessageRule()
+		 * @generated
+		 */
+		EClass MESSAGE_RULE = eINSTANCE.getMessageRule();
+
+		/**
+		 * The meta object literal for the '<em><b>Sequence Term</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference MESSAGE_RULE__SEQUENCE_TERM = eINSTANCE.getMessageRule_SequenceTerm();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute MESSAGE_RULE__NAME = eINSTANCE.getMessageRule_Name();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl <em>Sequence Term Rule</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl
+		 * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessagePackageImpl#getSequenceTermRule()
+		 * @generated
+		 */
+		EClass SEQUENCE_TERM_RULE = eINSTANCE.getSequenceTermRule();
+
+		/**
+		 * The meta object literal for the '<em><b>Sequencial Order</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER = eINSTANCE.getSequenceTermRule_SequencialOrder();
+
+		/**
+		 * The meta object literal for the '<em><b>Sequence Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute SEQUENCE_TERM_RULE__SEQUENCE_NAME = eINSTANCE.getSequenceTermRule_SequenceName();
+
+		/**
+		 * The meta object literal for the '<em><b>Recurrence</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute SEQUENCE_TERM_RULE__RECURRENCE = eINSTANCE.getSequenceTermRule_Recurrence();
+
+	}
+
+} // UmlMessagePackage
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/MessageRuleImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/MessageRuleImpl.java
index 1efe3c58be7..a2d911e1254 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/MessageRuleImpl.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/MessageRuleImpl.java
@@ -1,255 +1,237 @@
-/**

- */

-package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.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.uml.textedit.message.xtext.umlMessage.MessageRule;

-import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule;

-import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Message Rule</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.MessageRuleImpl#getSequenceTerm <em>Sequence Term</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.MessageRuleImpl#getName <em>Name</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class MessageRuleImpl extends MinimalEObjectImpl.Container implements MessageRule

-{

-	/**

-	 * The cached value of the '{@link #getSequenceTerm() <em>Sequence Term</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSequenceTerm()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<SequenceTermRule> sequenceTerm;

-

-	/**

-	 * 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 MessageRuleImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return UmlMessagePackage.Literals.MESSAGE_RULE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<SequenceTermRule> getSequenceTerm()

-	{

-		if (sequenceTerm == null)

-		{

-			sequenceTerm = new EObjectContainmentEList<SequenceTermRule>(SequenceTermRule.class, this, UmlMessagePackage.MESSAGE_RULE__SEQUENCE_TERM);

-		}

-		return sequenceTerm;

-	}

-

-	/**

-	 * <!-- 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, UmlMessagePackage.MESSAGE_RULE__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case UmlMessagePackage.MESSAGE_RULE__SEQUENCE_TERM:

-			return ((InternalEList<?>) getSequenceTerm()).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 UmlMessagePackage.MESSAGE_RULE__SEQUENCE_TERM:

-			return getSequenceTerm();

-		case UmlMessagePackage.MESSAGE_RULE__NAME:

-			return getName();

-		}

-		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 UmlMessagePackage.MESSAGE_RULE__SEQUENCE_TERM:

-			getSequenceTerm().clear();

-			getSequenceTerm().addAll((Collection<? extends SequenceTermRule>) newValue);

-			return;

-		case UmlMessagePackage.MESSAGE_RULE__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 UmlMessagePackage.MESSAGE_RULE__SEQUENCE_TERM:

-			getSequenceTerm().clear();

-			return;

-		case UmlMessagePackage.MESSAGE_RULE__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case UmlMessagePackage.MESSAGE_RULE__SEQUENCE_TERM:

-			return sequenceTerm != null && !sequenceTerm.isEmpty();

-		case UmlMessagePackage.MESSAGE_RULE__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();

-	}

-

-} // MessageRuleImpl

+/**
+ */
+package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.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.uml.textedit.message.xtext.umlMessage.MessageRule;
+import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule;
+import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Message Rule</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.MessageRuleImpl#getSequenceTerm <em>Sequence Term</em>}</li>
+ * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.MessageRuleImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class MessageRuleImpl extends MinimalEObjectImpl.Container implements MessageRule {
+	/**
+	 * The cached value of the '{@link #getSequenceTerm() <em>Sequence Term</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSequenceTerm()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<SequenceTermRule> sequenceTerm;
+
+	/**
+	 * 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 MessageRuleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return UmlMessagePackage.Literals.MESSAGE_RULE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<SequenceTermRule> getSequenceTerm() {
+		if (sequenceTerm == null) {
+			sequenceTerm = new EObjectContainmentEList<SequenceTermRule>(SequenceTermRule.class, this, UmlMessagePackage.MESSAGE_RULE__SEQUENCE_TERM);
+		}
+		return sequenceTerm;
+	}
+
+	/**
+	 * <!-- 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, UmlMessagePackage.MESSAGE_RULE__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case UmlMessagePackage.MESSAGE_RULE__SEQUENCE_TERM:
+			return ((InternalEList<?>) getSequenceTerm()).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 UmlMessagePackage.MESSAGE_RULE__SEQUENCE_TERM:
+			return getSequenceTerm();
+		case UmlMessagePackage.MESSAGE_RULE__NAME:
+			return getName();
+		}
+		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 UmlMessagePackage.MESSAGE_RULE__SEQUENCE_TERM:
+			getSequenceTerm().clear();
+			getSequenceTerm().addAll((Collection<? extends SequenceTermRule>) newValue);
+			return;
+		case UmlMessagePackage.MESSAGE_RULE__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 UmlMessagePackage.MESSAGE_RULE__SEQUENCE_TERM:
+			getSequenceTerm().clear();
+			return;
+		case UmlMessagePackage.MESSAGE_RULE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case UmlMessagePackage.MESSAGE_RULE__SEQUENCE_TERM:
+			return sequenceTerm != null && !sequenceTerm.isEmpty();
+		case UmlMessagePackage.MESSAGE_RULE__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();
+	}
+
+} // MessageRuleImpl
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/SequenceTermRuleImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/SequenceTermRuleImpl.java
index 98dadf4d420..d9c4f73c7e1 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/SequenceTermRuleImpl.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/SequenceTermRuleImpl.java
@@ -1,316 +1,298 @@
-/**

- */

-package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.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.uml.textedit.message.xtext.umlMessage.SequenceTermRule;

-import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Sequence Term Rule</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl#getSequencialOrder <em>Sequencial Order</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl#getSequenceName <em>Sequence Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl#getRecurrence <em>Recurrence</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implements SequenceTermRule

-{

-	/**

-	 * The default value of the '{@link #getSequencialOrder() <em>Sequencial Order</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSequencialOrder()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final int SEQUENCIAL_ORDER_EDEFAULT = 0;

-

-	/**

-	 * The cached value of the '{@link #getSequencialOrder() <em>Sequencial Order</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSequencialOrder()

-	 * @generated

-	 * @ordered

-	 */

-	protected int sequencialOrder = SEQUENCIAL_ORDER_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getSequenceName() <em>Sequence Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSequenceName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String SEQUENCE_NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getSequenceName() <em>Sequence Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSequenceName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String sequenceName = SEQUENCE_NAME_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getRecurrence() <em>Recurrence</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getRecurrence()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String RECURRENCE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getRecurrence() <em>Recurrence</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getRecurrence()

-	 * @generated

-	 * @ordered

-	 */

-	protected String recurrence = RECURRENCE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SequenceTermRuleImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return UmlMessagePackage.Literals.SEQUENCE_TERM_RULE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public int getSequencialOrder()

-	{

-		return sequencialOrder;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setSequencialOrder(int newSequencialOrder)

-	{

-		int oldSequencialOrder = sequencialOrder;

-		sequencialOrder = newSequencialOrder;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER, oldSequencialOrder, sequencialOrder));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getSequenceName()

-	{

-		return sequenceName;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setSequenceName(String newSequenceName)

-	{

-		String oldSequenceName = sequenceName;

-		sequenceName = newSequenceName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCE_NAME, oldSequenceName, sequenceName));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getRecurrence()

-	{

-		return recurrence;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setRecurrence(String newRecurrence)

-	{

-		String oldRecurrence = recurrence;

-		recurrence = newRecurrence;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, UmlMessagePackage.SEQUENCE_TERM_RULE__RECURRENCE, oldRecurrence, recurrence));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER:

-			return getSequencialOrder();

-		case UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCE_NAME:

-			return getSequenceName();

-		case UmlMessagePackage.SEQUENCE_TERM_RULE__RECURRENCE:

-			return getRecurrence();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER:

-			setSequencialOrder((Integer) newValue);

-			return;

-		case UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCE_NAME:

-			setSequenceName((String) newValue);

-			return;

-		case UmlMessagePackage.SEQUENCE_TERM_RULE__RECURRENCE:

-			setRecurrence((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER:

-			setSequencialOrder(SEQUENCIAL_ORDER_EDEFAULT);

-			return;

-		case UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCE_NAME:

-			setSequenceName(SEQUENCE_NAME_EDEFAULT);

-			return;

-		case UmlMessagePackage.SEQUENCE_TERM_RULE__RECURRENCE:

-			setRecurrence(RECURRENCE_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER:

-			return sequencialOrder != SEQUENCIAL_ORDER_EDEFAULT;

-		case UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCE_NAME:

-			return SEQUENCE_NAME_EDEFAULT == null ? sequenceName != null : !SEQUENCE_NAME_EDEFAULT.equals(sequenceName);

-		case UmlMessagePackage.SEQUENCE_TERM_RULE__RECURRENCE:

-			return RECURRENCE_EDEFAULT == null ? recurrence != null : !RECURRENCE_EDEFAULT.equals(recurrence);

-		}

-		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(" (sequencialOrder: ");

-		result.append(sequencialOrder);

-		result.append(", sequenceName: ");

-		result.append(sequenceName);

-		result.append(", recurrence: ");

-		result.append(recurrence);

-		result.append(')');

-		return result.toString();

-	}

-

-} // SequenceTermRuleImpl

+/**
+ */
+package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.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.uml.textedit.message.xtext.umlMessage.SequenceTermRule;
+import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Sequence Term Rule</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl#getSequencialOrder <em>Sequencial Order</em>}</li>
+ * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl#getSequenceName <em>Sequence Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl#getRecurrence <em>Recurrence</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implements SequenceTermRule {
+	/**
+	 * The default value of the '{@link #getSequencialOrder() <em>Sequencial Order</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSequencialOrder()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int SEQUENCIAL_ORDER_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getSequencialOrder() <em>Sequencial Order</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSequencialOrder()
+	 * @generated
+	 * @ordered
+	 */
+	protected int sequencialOrder = SEQUENCIAL_ORDER_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getSequenceName() <em>Sequence Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSequenceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SEQUENCE_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getSequenceName() <em>Sequence Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSequenceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String sequenceName = SEQUENCE_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getRecurrence() <em>Recurrence</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getRecurrence()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String RECURRENCE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getRecurrence() <em>Recurrence</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getRecurrence()
+	 * @generated
+	 * @ordered
+	 */
+	protected String recurrence = RECURRENCE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected SequenceTermRuleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return UmlMessagePackage.Literals.SEQUENCE_TERM_RULE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int getSequencialOrder() {
+		return sequencialOrder;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setSequencialOrder(int newSequencialOrder) {
+		int oldSequencialOrder = sequencialOrder;
+		sequencialOrder = newSequencialOrder;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER, oldSequencialOrder, sequencialOrder));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getSequenceName() {
+		return sequenceName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setSequenceName(String newSequenceName) {
+		String oldSequenceName = sequenceName;
+		sequenceName = newSequenceName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCE_NAME, oldSequenceName, sequenceName));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getRecurrence() {
+		return recurrence;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setRecurrence(String newRecurrence) {
+		String oldRecurrence = recurrence;
+		recurrence = newRecurrence;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, UmlMessagePackage.SEQUENCE_TERM_RULE__RECURRENCE, oldRecurrence, recurrence));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER:
+			return getSequencialOrder();
+		case UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCE_NAME:
+			return getSequenceName();
+		case UmlMessagePackage.SEQUENCE_TERM_RULE__RECURRENCE:
+			return getRecurrence();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER:
+			setSequencialOrder((Integer) newValue);
+			return;
+		case UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCE_NAME:
+			setSequenceName((String) newValue);
+			return;
+		case UmlMessagePackage.SEQUENCE_TERM_RULE__RECURRENCE:
+			setRecurrence((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER:
+			setSequencialOrder(SEQUENCIAL_ORDER_EDEFAULT);
+			return;
+		case UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCE_NAME:
+			setSequenceName(SEQUENCE_NAME_EDEFAULT);
+			return;
+		case UmlMessagePackage.SEQUENCE_TERM_RULE__RECURRENCE:
+			setRecurrence(RECURRENCE_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER:
+			return sequencialOrder != SEQUENCIAL_ORDER_EDEFAULT;
+		case UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCE_NAME:
+			return SEQUENCE_NAME_EDEFAULT == null ? sequenceName != null : !SEQUENCE_NAME_EDEFAULT.equals(sequenceName);
+		case UmlMessagePackage.SEQUENCE_TERM_RULE__RECURRENCE:
+			return RECURRENCE_EDEFAULT == null ? recurrence != null : !RECURRENCE_EDEFAULT.equals(recurrence);
+		}
+		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(" (sequencialOrder: ");
+		result.append(sequencialOrder);
+		result.append(", sequenceName: ");
+		result.append(sequenceName);
+		result.append(", recurrence: ");
+		result.append(recurrence);
+		result.append(')');
+		return result.toString();
+	}
+
+} // SequenceTermRuleImpl
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/UmlMessageFactoryImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/UmlMessageFactoryImpl.java
index 8b9e965c529..a21bbe4e859 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/UmlMessageFactoryImpl.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/UmlMessageFactoryImpl.java
@@ -1,130 +1,118 @@
-/**

- */

-package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.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.uml.textedit.message.xtext.umlMessage.MessageRule;

-import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule;

-import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessageFactory;

-import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class UmlMessageFactoryImpl extends EFactoryImpl implements UmlMessageFactory

-{

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static UmlMessageFactory init()

-	{

-		try

-		{

-			UmlMessageFactory theUmlMessageFactory = (UmlMessageFactory) EPackage.Registry.INSTANCE.getEFactory(UmlMessagePackage.eNS_URI);

-			if (theUmlMessageFactory != null)

-			{

-				return theUmlMessageFactory;

-			}

-		} catch (Exception exception)

-		{

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new UmlMessageFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public UmlMessageFactoryImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass)

-	{

-		switch (eClass.getClassifierID())

-		{

-		case UmlMessagePackage.MESSAGE_RULE:

-			return createMessageRule();

-		case UmlMessagePackage.SEQUENCE_TERM_RULE:

-			return createSequenceTermRule();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public MessageRule createMessageRule()

-	{

-		MessageRuleImpl messageRule = new MessageRuleImpl();

-		return messageRule;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public SequenceTermRule createSequenceTermRule()

-	{

-		SequenceTermRuleImpl sequenceTermRule = new SequenceTermRuleImpl();

-		return sequenceTermRule;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public UmlMessagePackage getUmlMessagePackage()

-	{

-		return (UmlMessagePackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static UmlMessagePackage getPackage()

-	{

-		return UmlMessagePackage.eINSTANCE;

-	}

-

-} // UmlMessageFactoryImpl

+/**
+ */
+package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.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.uml.textedit.message.xtext.umlMessage.MessageRule;
+import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule;
+import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessageFactory;
+import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class UmlMessageFactoryImpl extends EFactoryImpl implements UmlMessageFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static UmlMessageFactory init() {
+		try {
+			UmlMessageFactory theUmlMessageFactory = (UmlMessageFactory) EPackage.Registry.INSTANCE.getEFactory(UmlMessagePackage.eNS_URI);
+			if (theUmlMessageFactory != null) {
+				return theUmlMessageFactory;
+			}
+		} catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new UmlMessageFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public UmlMessageFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+		case UmlMessagePackage.MESSAGE_RULE:
+			return createMessageRule();
+		case UmlMessagePackage.SEQUENCE_TERM_RULE:
+			return createSequenceTermRule();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public MessageRule createMessageRule() {
+		MessageRuleImpl messageRule = new MessageRuleImpl();
+		return messageRule;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public SequenceTermRule createSequenceTermRule() {
+		SequenceTermRuleImpl sequenceTermRule = new SequenceTermRuleImpl();
+		return sequenceTermRule;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public UmlMessagePackage getUmlMessagePackage() {
+		return (UmlMessagePackage) getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static UmlMessagePackage getPackage() {
+		return UmlMessagePackage.eINSTANCE;
+	}
+
+} // UmlMessageFactoryImpl
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/UmlMessagePackageImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/UmlMessagePackageImpl.java
index 57457927e30..0914dd66994 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/UmlMessagePackageImpl.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/UmlMessagePackageImpl.java
@@ -1,287 +1,283 @@
-/**

- */

-package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl;

-

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

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

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

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

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

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule;

-import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule;

-import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessageFactory;

-import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class UmlMessagePackageImpl extends EPackageImpl implements UmlMessagePackage

-{

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass messageRuleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass sequenceTermRuleEClass = 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.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private UmlMessagePackageImpl()

-	{

-		super(eNS_URI, UmlMessageFactory.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 UmlMessagePackage#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 UmlMessagePackage init()

-	{

-		if (isInited) {

-			return (UmlMessagePackage) EPackage.Registry.INSTANCE.getEPackage(UmlMessagePackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		UmlMessagePackageImpl theUmlMessagePackage = (UmlMessagePackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UmlMessagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UmlMessagePackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-

-		// Create package meta-data objects

-		theUmlMessagePackage.createPackageContents();

-

-		// Initialize created meta-data

-		theUmlMessagePackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theUmlMessagePackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(UmlMessagePackage.eNS_URI, theUmlMessagePackage);

-		return theUmlMessagePackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getMessageRule()

-	{

-		return messageRuleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getMessageRule_SequenceTerm()

-	{

-		return (EReference) messageRuleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getMessageRule_Name()

-	{

-		return (EAttribute) messageRuleEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getSequenceTermRule()

-	{

-		return sequenceTermRuleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getSequenceTermRule_SequencialOrder()

-	{

-		return (EAttribute) sequenceTermRuleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getSequenceTermRule_SequenceName()

-	{

-		return (EAttribute) sequenceTermRuleEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getSequenceTermRule_Recurrence()

-	{

-		return (EAttribute) sequenceTermRuleEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public UmlMessageFactory getUmlMessageFactory()

-	{

-		return (UmlMessageFactory) 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

-		messageRuleEClass = createEClass(MESSAGE_RULE);

-		createEReference(messageRuleEClass, MESSAGE_RULE__SEQUENCE_TERM);

-		createEAttribute(messageRuleEClass, MESSAGE_RULE__NAME);

-

-		sequenceTermRuleEClass = createEClass(SEQUENCE_TERM_RULE);

-		createEAttribute(sequenceTermRuleEClass, SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER);

-		createEAttribute(sequenceTermRuleEClass, SEQUENCE_TERM_RULE__SEQUENCE_NAME);

-		createEAttribute(sequenceTermRuleEClass, SEQUENCE_TERM_RULE__RECURRENCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model. This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void initializePackageContents()

-	{

-		if (isInitialized) {

-			return;

-		}

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-

-		// Initialize classes and features; add operations and parameters

-		initEClass(messageRuleEClass, MessageRule.class, "MessageRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getMessageRule_SequenceTerm(), this.getSequenceTermRule(), null, "sequenceTerm", null, 0, -1, MessageRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-		initEAttribute(getMessageRule_Name(), theEcorePackage.getEString(), "name", null, 0, 1, MessageRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(sequenceTermRuleEClass, SequenceTermRule.class, "SequenceTermRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getSequenceTermRule_SequencialOrder(), theEcorePackage.getEInt(), "sequencialOrder", null, 0, 1, SequenceTermRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getSequenceTermRule_SequenceName(), theEcorePackage.getEString(), "sequenceName", null, 0, 1, SequenceTermRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getSequenceTermRule_Recurrence(), theEcorePackage.getEString(), "recurrence", null, 0, 1, SequenceTermRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} // UmlMessagePackageImpl

+/**
+ */
+package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule;
+import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule;
+import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessageFactory;
+import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class UmlMessagePackageImpl extends EPackageImpl implements UmlMessagePackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass messageRuleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass sequenceTermRuleEClass = 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.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private UmlMessagePackageImpl() {
+		super(eNS_URI, UmlMessageFactory.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 UmlMessagePackage#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 UmlMessagePackage init() {
+		if (isInited) {
+			return (UmlMessagePackage) EPackage.Registry.INSTANCE.getEPackage(UmlMessagePackage.eNS_URI);
+		}
+
+		// Obtain or create and register package
+		UmlMessagePackageImpl theUmlMessagePackage = (UmlMessagePackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UmlMessagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UmlMessagePackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theUmlMessagePackage.createPackageContents();
+
+		// Initialize created meta-data
+		theUmlMessagePackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theUmlMessagePackage.freeze();
+
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(UmlMessagePackage.eNS_URI, theUmlMessagePackage);
+		return theUmlMessagePackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getMessageRule() {
+		return messageRuleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EReference getMessageRule_SequenceTerm() {
+		return (EReference) messageRuleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getMessageRule_Name() {
+		return (EAttribute) messageRuleEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getSequenceTermRule() {
+		return sequenceTermRuleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getSequenceTermRule_SequencialOrder() {
+		return (EAttribute) sequenceTermRuleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getSequenceTermRule_SequenceName() {
+		return (EAttribute) sequenceTermRuleEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getSequenceTermRule_Recurrence() {
+		return (EAttribute) sequenceTermRuleEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public UmlMessageFactory getUmlMessageFactory() {
+		return (UmlMessageFactory) 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
+		messageRuleEClass = createEClass(MESSAGE_RULE);
+		createEReference(messageRuleEClass, MESSAGE_RULE__SEQUENCE_TERM);
+		createEAttribute(messageRuleEClass, MESSAGE_RULE__NAME);
+
+		sequenceTermRuleEClass = createEClass(SEQUENCE_TERM_RULE);
+		createEAttribute(sequenceTermRuleEClass, SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER);
+		createEAttribute(sequenceTermRuleEClass, SEQUENCE_TERM_RULE__SEQUENCE_NAME);
+		createEAttribute(sequenceTermRuleEClass, SEQUENCE_TERM_RULE__RECURRENCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model. This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) {
+			return;
+		}
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+
+		// Initialize classes and features; add operations and parameters
+		initEClass(messageRuleEClass, MessageRule.class, "MessageRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getMessageRule_SequenceTerm(), this.getSequenceTermRule(), null, "sequenceTerm", null, 0, -1, MessageRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEAttribute(getMessageRule_Name(), theEcorePackage.getEString(), "name", null, 0, 1, MessageRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(sequenceTermRuleEClass, SequenceTermRule.class, "SequenceTermRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getSequenceTermRule_SequencialOrder(), theEcorePackage.getEInt(), "sequencialOrder", null, 0, 1, SequenceTermRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getSequenceTermRule_SequenceName(), theEcorePackage.getEString(), "sequenceName", null, 0, 1, SequenceTermRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getSequenceTermRule_Recurrence(), theEcorePackage.getEString(), "recurrence", null, 0, 1, SequenceTermRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} // UmlMessagePackageImpl
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/util/UmlMessageAdapterFactory.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/util/UmlMessageAdapterFactory.java
index 25eee25be72..cae3208e4a4 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/util/UmlMessageAdapterFactory.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/util/UmlMessageAdapterFactory.java
@@ -1,163 +1,148 @@
-/**

- */

-package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.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.textedit.message.xtext.umlMessage.MessageRule;

-import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule;

-import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage;

-

-/**

- * <!-- 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.textedit.message.xtext.umlMessage.UmlMessagePackage

- * @generated

- */

-public class UmlMessageAdapterFactory extends AdapterFactoryImpl

-{

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static UmlMessagePackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public UmlMessageAdapterFactory()

-	{

-		if (modelPackage == null)

-		{

-			modelPackage = UmlMessagePackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object)

-	{

-		if (object == modelPackage)

-		{

-			return true;

-		}

-		if (object instanceof EObject)

-		{

-			return ((EObject) object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected UmlMessageSwitch<Adapter> modelSwitch =

-			new UmlMessageSwitch<Adapter>()

-			{

-				@Override

-				public Adapter caseMessageRule(MessageRule object)

-				{

-					return createMessageRuleAdapter();

-				}

-

-				@Override

-				public Adapter caseSequenceTermRule(SequenceTermRule object)

-				{

-					return createSequenceTermRuleAdapter();

-				}

-

-				@Override

-				public Adapter defaultCase(EObject object)

-				{

-					return createEObjectAdapter();

-				}

-			};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *            the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target)

-	{

-		return modelSwitch.doSwitch((EObject) target);

-	}

-

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule <em>Message Rule</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.uml.textedit.message.xtext.umlMessage.MessageRule

-	 * @generated

-	 */

-	public Adapter createMessageRuleAdapter()

-	{

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule <em>Sequence Term Rule</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.uml.textedit.message.xtext.umlMessage.SequenceTermRule

-	 * @generated

-	 */

-	public Adapter createSequenceTermRuleAdapter()

-	{

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter()

-	{

-		return null;

-	}

-

-} // UmlMessageAdapterFactory

+/**
+ */
+package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.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.textedit.message.xtext.umlMessage.MessageRule;
+import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule;
+import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage;
+
+/**
+ * <!-- 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.textedit.message.xtext.umlMessage.UmlMessagePackage
+ * @generated
+ */
+public class UmlMessageAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static UmlMessagePackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public UmlMessageAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = UmlMessagePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject) object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected UmlMessageSwitch<Adapter> modelSwitch = new UmlMessageSwitch<Adapter>() {
+		@Override
+		public Adapter caseMessageRule(MessageRule object) {
+			return createMessageRuleAdapter();
+		}
+
+		@Override
+		public Adapter caseSequenceTermRule(SequenceTermRule object) {
+			return createSequenceTermRuleAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param target
+	 *            the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject) target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule <em>Message Rule</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.uml.textedit.message.xtext.umlMessage.MessageRule
+	 * @generated
+	 */
+	public Adapter createMessageRuleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule <em>Sequence Term Rule</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.uml.textedit.message.xtext.umlMessage.SequenceTermRule
+	 * @generated
+	 */
+	public Adapter createSequenceTermRuleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} // UmlMessageAdapterFactory
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/util/UmlMessageSwitch.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/util/UmlMessageSwitch.java
index 3a2163c1bef..2a3a4ef0cf4 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/util/UmlMessageSwitch.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/util/UmlMessageSwitch.java
@@ -1,155 +1,148 @@
-/**

- */

-package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.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.textedit.message.xtext.umlMessage.MessageRule;

-import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule;

-import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage

- * @generated

- */

-public class UmlMessageSwitch<T> extends Switch<T>

-{

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static UmlMessagePackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public UmlMessageSwitch()

-	{

-		if (modelPackage == null)

-		{

-			modelPackage = UmlMessagePackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage)

-	{

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject)

-	{

-		switch (classifierID)

-		{

-		case UmlMessagePackage.MESSAGE_RULE: {

-			MessageRule messageRule = (MessageRule) theEObject;

-			T result = caseMessageRule(messageRule);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case UmlMessagePackage.SEQUENCE_TERM_RULE: {

-			SequenceTermRule sequenceTermRule = (SequenceTermRule) theEObject;

-			T result = caseSequenceTermRule(sequenceTermRule);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Message Rule</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>Message Rule</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseMessageRule(MessageRule object)

-	{

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Sequence Term Rule</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>Sequence Term Rule</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSequenceTermRule(SequenceTermRule object)

-	{

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object)

-	{

-		return null;

-	}

-

-} // UmlMessageSwitch

+/**
+ */
+package org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.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.textedit.message.xtext.umlMessage.MessageRule;
+import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule;
+import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage
+ * @generated
+ */
+public class UmlMessageSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static UmlMessagePackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public UmlMessageSwitch() {
+		if (modelPackage == null) {
+			modelPackage = UmlMessagePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param ePackage
+	 *            the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+		case UmlMessagePackage.MESSAGE_RULE: {
+			MessageRule messageRule = (MessageRule) theEObject;
+			T result = caseMessageRule(messageRule);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case UmlMessagePackage.SEQUENCE_TERM_RULE: {
+			SequenceTermRule sequenceTermRule = (SequenceTermRule) theEObject;
+			T result = caseSequenceTermRule(sequenceTermRule);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Message Rule</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>Message Rule</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseMessageRule(MessageRule object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Sequence Term Rule</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>Sequence Term Rule</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSequenceTermRule(SequenceTermRule object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} // UmlMessageSwitch
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.xtext b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.xtext
index 7bfc1b96a17..712fd1bdb38 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.xtext
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.xtext
@@ -1,30 +1,29 @@
 grammar org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessage with org.eclipse.papyrus.uml.alf.Common
 
 import "http://www.eclipse.org/uml2/5.0.0/UML" as uml
-
 generate umlMessage "http://www.eclipse.org/papyrus/uml/textedit/message/xtext/UmlMessage"
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
 
-MessageRule: 
-sequenceTerm += SequenceTermRule 
-('.' sequenceTerm += SequenceTermRule)*
-':'
-name = nameRule
-;
-
-SequenceTermRule :
-sequencialOrder = INT //represents the sequential order of the Message within the next higher level of procedural calling
-(sequenceName = ID)? // represents a concurrent thread of control. Messages that differ in the final name are concurrent at that level of nesting
-(recurrence = RecurrenceRule)? // The recurrence represents conditional or iterative execution.
-//('.' leftTerms += LeftSequenceTermRule)*
+MessageRule:
+	sequenceTerm+=SequenceTermRule
+	('.' sequenceTerm+=SequenceTermRule)*
+	':'
+	name=NAME_RULE;
+
+SequenceTermRule:
+	sequencialOrder=INT //represents the sequential order of the Message within the next higher level of procedural calling
+	(sequenceName=ID)? // represents a concurrent thread of control. Messages that differ in the final name are concurrent at that level of nesting
+	(recurrence=RecurrenceRule)? // The recurrence represents conditional or iterative execution.
+	//('.' leftTerms += LeftSequenceTermRule)*
 ;
 
-terminal nameRule returns ecore::EString: ('a'..'z'|'A'..'Z') ('a'..'z'|'A'..'Z'|'_'|'-'|'0'..'9'|'('|')')*;
+terminal NAME_RULE returns ecore::EString:
+	('a'..'z' | 'A'..'Z') ('a'..'z' | 'A'..'Z' | '_' | '-' | '0'..'9' | '(' | ')')*;
 
-RecurrenceRule : 
-('*' '[' STRING ']')|('[' STRING ']') ;
+RecurrenceRule:
+	('*' '[' STRING ']') | ('[' STRING ']');
 
-//terminal STRING :
+	//terminal STRING :
 //( '\\' ('b'|'t'|'n'|'f'|'r'|'"'|"'"|'\\') | !('\\'|'"') )* ;
 
 
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/MultiplicityElementUtil.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/MultiplicityElementUtil.java
index 46eb1f50e1a..f28631652a4 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/MultiplicityElementUtil.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/MultiplicityElementUtil.java
@@ -13,7 +13,10 @@
  *****************************************************************************/
 package org.eclipse.papyrus.uml.tools.utils;
 
+import org.eclipse.uml2.uml.LiteralInteger;
+import org.eclipse.uml2.uml.LiteralUnlimitedNatural;
 import org.eclipse.uml2.uml.MultiplicityElement;
+import org.eclipse.uml2.uml.ValueSpecification;
 
 /**
  * Utility class for <code>org.eclipse.uml2.uml.MultiplicityElement</code><BR>
@@ -21,18 +24,29 @@ import org.eclipse.uml2.uml.MultiplicityElement;
 public class MultiplicityElementUtil {
 
 	/**
+	 * The string representing the multiplicity with space " [x..y]"
+	 * Clients should format the spaces at the calling side, but this method left here for backward compatibility
+	 */
+	@Deprecated
+	public static String getMultiplicityAsString(MultiplicityElement element) {
+		String multiplicity = formatMultiplicity(element);
+		return multiplicity == null || multiplicity.isEmpty() ? "" : " " + multiplicity;
+	}
+
+	/**
 	 * Return the multiplicity of the element "[x..y]"
 	 *
 	 * @return the string representing the multiplicity
 	 */
-	public static String getMultiplicityAsString(MultiplicityElement element) {
-		StringBuffer buffer = new StringBuffer();
-		String multiplicityStr = getMultiplicityAsStringWithoutSquareBrackets(element);
-		if (multiplicityStr != null && !"".equals(multiplicityStr)) {
-			buffer.append(" [");
-			buffer.append(multiplicityStr);
-			buffer.append("]");
+	public static String formatMultiplicity(MultiplicityElement element) {
+		String multiplicityStr = formatMultiplicityNoBrackets(element);
+		if (multiplicityStr == null || multiplicityStr.isEmpty()) {
+			return "";
 		}
+		StringBuffer buffer = new StringBuffer();
+		buffer.append("[");
+		buffer.append(multiplicityStr);
+		buffer.append("]");
 		return buffer.toString();
 	}
 
@@ -41,26 +55,55 @@ public class MultiplicityElementUtil {
 	 *
 	 * @return the string representing the multiplicity, without square brackets
 	 */
-	public static String getMultiplicityAsStringWithoutSquareBrackets(MultiplicityElement element) {
-		StringBuffer buffer = new StringBuffer();
-		// special case for [1] and [*]
-		int lower = element.getLower();
-		int upper = element.getUpper();
+	public static String formatMultiplicityNoBrackets(MultiplicityElement element) {
+		ValueSpecification lowerSpecification = element.getLowerValue();
+		ValueSpecification upperSpecification = element.getUpperValue();
+		if (lowerSpecification == null && upperSpecification == null) {
+			return setupMultiplicityAsInteger(element.getLower(), element.getUpper());
+		}
+		if (lowerSpecification == null && upperSpecification instanceof LiteralUnlimitedNatural) {
+			return setupMultiplicityAsInteger(element.getLower(), ((LiteralUnlimitedNatural) upperSpecification).unlimitedValue());
+		}
+		if (lowerSpecification instanceof LiteralInteger && upperSpecification == null) {
+			return setupMultiplicityAsInteger(((LiteralInteger) lowerSpecification).integerValue(), element.getUpper());
+		}
+		if (lowerSpecification instanceof LiteralInteger && upperSpecification instanceof LiteralUnlimitedNatural) {
+			return setupMultiplicityAsInteger(((LiteralInteger) lowerSpecification).integerValue(), ((LiteralUnlimitedNatural) upperSpecification).unlimitedValue());
+		}
+		return setupMultiplicityAsString(element, lowerSpecification, upperSpecification);
+	}
 
+	private static String setupMultiplicityAsInteger(int lower, int upper) {
+		// special case for [1] and [*]
 		if (lower == upper) {
-			buffer.append(lower);
+			return new Integer(lower).toString();
 		} else if ((lower == 0) && (upper == -1)) {
-			buffer.append("*");
+			return "*";
 		} else if (upper == -1) {
-			buffer.append(lower);
-			buffer.append("..*");
+			return lower + "..*";
 		} else {
-			buffer.append(lower);
-			buffer.append("..");
-			buffer.append(upper);
+			return lower + ".." + upper;
 		}
+	}
 
-		return buffer.toString();
+	private static String setupMultiplicityAsString(MultiplicityElement element, ValueSpecification lower, ValueSpecification upper) {
+		String lowerStr = ValueSpecificationUtil.getSpecificationValue(lower);
+		if ("*".equals(lowerStr)) {
+			return "";
+		}
+		String upperStr = ValueSpecificationUtil.getSpecificationValue(upper);
+		if (lowerStr != null && false == lowerStr.isEmpty() && lowerStr.equalsIgnoreCase(upperStr)) {
+			return lowerStr;
+		}
+		StringBuffer result = new StringBuffer();
+		result.append(lowerStr == null || lowerStr.isEmpty() ? element.getLower() : lowerStr);
+		result.append("..");
+		result.append(upperStr == null || upperStr.isEmpty() ? getUpper(element) : upperStr);
+		return result.toString();
+	}
+
+	private static String getUpper(MultiplicityElement element) {
+		return element.getUpper() == -1 ? "" : new Integer(element.getUpper()).toString();
 	}
 
 	/**
diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeCollector.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeCollector.java
index f683e4d8b93..c26d890b076 100644
--- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeCollector.java
+++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeCollector.java
@@ -24,8 +24,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.SortedSet;
 
-import org.eclipse.core.internal.resources.Project;
 import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
@@ -145,16 +145,16 @@ public class ScopeCollector implements IScopeCollector {
 		while (it.hasNext()) {
 			Object next = it.next();
 
-			if (!(next instanceof IPapyrusFile) && !(next instanceof IPapyrusFile)) {
-				if (next instanceof Project) {
-					Project project = (Project) next;
+			if (!(next instanceof IPapyrusFile)) {
+				if (next instanceof IContainer) { // Folder, project, etc...
+					IContainer project = (IContainer) next;
 					ArrayList<URI> diFiles = new ArrayList<URI>();
 					IPath path = project.getLocation();
 					IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-					
+
 					recursiveFindDiFiles(diFiles, path, workspaceRoot);
 					results.addAll(diFiles);
-				} else {
+				} else { // Not a container, so it is some other kind of resource (e.g. file, graphical element)
 					Object element = BusinessModelResolver.getInstance().getBusinessModel(next);
 					if (element instanceof EObject) {
 						// CDO resource *are* EObjects
@@ -202,18 +202,21 @@ public class ScopeCollector implements IScopeCollector {
 	}
 	
 	protected void recursiveFindDiFiles(ArrayList<URI> diFiles, IPath path, IWorkspaceRoot workspaceRoot) {
-		IContainer  container =  workspaceRoot.getContainerForLocation(path);
+		IContainer container =  workspaceRoot.getContainerForLocation(path);
 
 		try {
 			IResource[] iResources;
 			iResources = container.members();
-			for (IResource iResource : iResources){
-				// for c files
-				if ("di".equalsIgnoreCase(iResource.getFileExtension())) {
-					//diFiles.add(iResource.getLocationURI());
-					URI theURI = URI.createPlatformResourceURI(iResource.getFullPath().toString(), true);
-					diFiles.add(theURI);
-				} else if (iResource.getType() == IResource.FOLDER) {
+			
+			for (IResource iResource : iResources) {
+				IFile iFile = (IFile) iResource.getAdapter(IFile.class);
+
+				if (iFile != null) {
+					if ("di".equalsIgnoreCase(iResource.getFileExtension())) {
+						URI theURI = URI.createPlatformResourceURI(iResource.getFullPath().toString(), true);
+						diFiles.add(theURI);
+					}
+				} else {
 					IPath tmpPath = iResource.getLocation();
 					recursiveFindDiFiles(diFiles, tmpPath, workspaceRoot);
 				}
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 27209d75cfd..5db6b3f889b 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
@@ -28,7 +28,8 @@ TestActivityChildNodeInStructuredActivity.class,
 TestActivityGroup.class,

 TestDropObjects.class,

 TestCommentLink.class,

-TestSemanticContainerFeature.class

+TestSemanticContainerFeature.class,

+TestLinks.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/TestLinks.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestLinks.java
new file mode 100644
index 00000000000..34b6baef9d8
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestLinks.java
@@ -0,0 +1,249 @@
+/*****************************************************************************
+ * 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 java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.AcceptEventActionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityParameterNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.BroadcastSignalActionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ControlFlowEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.CreateLinkActionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.InitialNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.InputPinInCreateLinkActionAsInputValueEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ObjectFlowEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.OpaqueActionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.OutputPinInAcceptEventActionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.OutputPinInOpaqueActEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ReadExtentActionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ReduceActionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ValuePinInReduceActionAsCollectionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestLinks extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IActivityDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IActivityDiagramTestsConstants.FILE_NAME;
+	}
+
+	protected Command createLinkCommand(IGraphicalEditPart start, IGraphicalEditPart end, IElementType type) {
+		List<IElementType> types = new LinkedList<IElementType>();
+		types.add(type);
+
+		AspectUnspecifiedTypeConnectionTool.CreateAspectUnspecifiedTypeConnectionRequest req =
+				new AspectUnspecifiedTypeConnectionTool(types).
+				new CreateAspectUnspecifiedTypeConnectionRequest(types, false, getDiagramEditPart().getDiagramPreferencesHint());
+
+		req.setSourceEditPart(start);
+		req.setType((RequestConstants.REQ_CONNECTION_START));
+
+		Command startCommand = start.getCommand(req);
+		Assert.assertNotNull(startCommand);
+
+		req.setStartCommand(startCommand);
+
+		req.setTargetEditPart(end);
+		req.setType(RequestConstants.REQ_CONNECTION_END);
+
+		Command endCommand = end.getCommand(req);
+		Assert.assertNotNull(endCommand);
+		Assert.assertTrue(endCommand.canExecute());
+		return endCommand;
+	}
+
+	protected void doReconnect(ReconnectRequest req) {
+		Command reorientCommand = req.getTarget().getCommand(req);
+		Assert.assertNotNull(reorientCommand);
+		Assert.assertTrue(reorientCommand.canExecute());
+
+		executeOnUIThread(reorientCommand);
+	}
+
+	@Test
+	public void testNoExecutableNodeFlowLink() {
+		IGraphicalEditPart acceptEventActionEP = createChild(AcceptEventActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		IGraphicalEditPart outputPinInAcceptEventAction = createChild(OutputPinInAcceptEventActionEditPart.VISUAL_ID, acceptEventActionEP);
+
+		IGraphicalEditPart reduceActionEP = createChild(ReduceActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+
+		List<IElementType> types = new LinkedList<IElementType>();
+		types.add(UMLElementTypes.ObjectFlow_4003);
+
+		AspectUnspecifiedTypeConnectionTool.CreateAspectUnspecifiedTypeConnectionRequest req =
+				new AspectUnspecifiedTypeConnectionTool(types).
+				new CreateAspectUnspecifiedTypeConnectionRequest(types, false, getDiagramEditPart().getDiagramPreferencesHint());
+
+		req.setSourceEditPart(outputPinInAcceptEventAction);
+		req.setType((RequestConstants.REQ_CONNECTION_START));
+
+		Command startCommand = outputPinInAcceptEventAction.getCommand(req);
+		Assert.assertNotNull(startCommand);
+
+		req.setStartCommand(startCommand);
+
+		req.setTargetEditPart(reduceActionEP);
+		req.setType(RequestConstants.REQ_CONNECTION_END);
+
+		Command endCommand = reduceActionEP.getCommand(req);
+		Assert.assertNull(endCommand);
+	}
+
+	@Test
+	public void testCreateObjectFlowLinkFromPinToPin() {
+		IGraphicalEditPart acceptEventActionEP = createChild(AcceptEventActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		IGraphicalEditPart outputPinInAcceptEventAction = createChild(OutputPinInAcceptEventActionEditPart.VISUAL_ID, acceptEventActionEP);
+
+		IGraphicalEditPart reduceActionEP = createChild(ReduceActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		IGraphicalEditPart inputPinInReduceAction = createChild(ValuePinInReduceActionAsCollectionEditPart.VISUAL_ID, reduceActionEP);
+
+		Command endCommand = createLinkCommand(outputPinInAcceptEventAction, inputPinInReduceAction, UMLElementTypes.ObjectFlow_4003);
+		Assert.assertNotNull(endCommand);
+		Assert.assertTrue(endCommand.canExecute());
+
+		executeOnUIThread(endCommand);
+		Assert.assertEquals(1, getDiagramEditPart().getConnections().size());
+		IGraphicalEditPart objectFlowConnection = (IGraphicalEditPart) getDiagramEditPart().getConnections().get(0);
+		Assert.assertTrue(objectFlowConnection instanceof ObjectFlowEditPart);
+	}
+
+	@Test
+	public void testCreateControlFlowLink() {
+		IGraphicalEditPart initialNodeEP = createChild(InitialNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		IGraphicalEditPart readExtentctionEP = createChild(ReadExtentActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+
+		Command endCommand = createLinkCommand(initialNodeEP, readExtentctionEP, UMLElementTypes.ControlFlow_4004);
+		Assert.assertNotNull(endCommand);
+		Assert.assertTrue(endCommand.canExecute());
+
+		executeOnUIThread(endCommand);
+		Assert.assertEquals(1, getDiagramEditPart().getConnections().size());
+		IGraphicalEditPart controlFlowConnection = (IGraphicalEditPart) getDiagramEditPart().getConnections().get(0);
+		Assert.assertTrue(controlFlowConnection instanceof ControlFlowEditPart);
+	}
+
+	@Test
+	public void testObjectFlowLinkReorient() {
+		IGraphicalEditPart parameterNodeEP = createChild(ActivityParameterNodeEditPart.VISUAL_ID, (IGraphicalEditPart)getActivityCompartmentEditPart().getParent());
+		IGraphicalEditPart opaqueEP = createChild(OpaqueActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+
+		IGraphicalEditPart createLinkACtionEP = createChild(CreateLinkActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		IGraphicalEditPart newTargetEP = createChild(InputPinInCreateLinkActionAsInputValueEditPart.VISUAL_ID, createLinkACtionEP);
+
+		Command endCommand = createLinkCommand(opaqueEP, parameterNodeEP, UMLElementTypes.ObjectFlow_4003);
+		Assert.assertNotNull(endCommand);
+		Assert.assertTrue(endCommand.canExecute());
+
+		executeOnUIThread(endCommand);
+		Assert.assertEquals(1, getDiagramEditPart().getConnections().size());
+		IGraphicalEditPart objectFlowConnection = (IGraphicalEditPart) getDiagramEditPart().getConnections().get(0);
+		Assert.assertTrue(objectFlowConnection instanceof ObjectFlowEditPart);
+
+		ObjectFlowEditPart objectFlowEP = (ObjectFlowEditPart)objectFlowConnection;
+
+		ReconnectRequest reconnect = getReconnectRequest(newTargetEP, objectFlowEP, RequestConstants.REQ_RECONNECT_TARGET);
+
+		Command reorientCommand = reconnect.getTarget().getCommand(reconnect);
+		Assert.assertNotNull(reorientCommand);
+		Assert.assertTrue(reorientCommand.canExecute());
+
+		executeOnUIThread(reorientCommand);
+		Assert.assertEquals(newTargetEP, objectFlowEP.getTarget());
+	}
+
+	@Test
+	public void testObjectFlowLinkReorientSourceFromPinToAction() {
+		IGraphicalEditPart opaqueEP = createChild(OpaqueActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		IGraphicalEditPart outputPinInOpaqueEP = createChild(OutputPinInOpaqueActEditPart.VISUAL_ID, opaqueEP);
+
+		IGraphicalEditPart createLinkACtionEP = createChild(CreateLinkActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+
+		Command endCommand = createLinkCommand(outputPinInOpaqueEP, opaqueEP, UMLElementTypes.ObjectFlow_4003);
+		Assert.assertNotNull(endCommand);
+		Assert.assertTrue(endCommand.canExecute());
+
+		executeOnUIThread(endCommand);
+		Assert.assertEquals(1, getDiagramEditPart().getConnections().size());
+		IGraphicalEditPart objectFlowConnection = (IGraphicalEditPart) getDiagramEditPart().getConnections().get(0);
+		Assert.assertTrue(objectFlowConnection instanceof ObjectFlowEditPart);
+
+		ObjectFlowEditPart objectFlowEP = (ObjectFlowEditPart)objectFlowConnection;
+
+		ReconnectRequest reconnect = getReconnectRequest(createLinkACtionEP, objectFlowEP, RequestConstants.REQ_RECONNECT_SOURCE);
+
+		Command reorientCommand = reconnect.getTarget().getCommand(reconnect);
+		Assert.assertNotNull(reorientCommand);
+		Assert.assertFalse(reorientCommand.canExecute());
+	}
+
+	@Test
+	public void testControlFlowLinkReorient() {
+		IGraphicalEditPart parameterNodeEP = createChild(ActivityParameterNodeEditPart.VISUAL_ID, (IGraphicalEditPart)getActivityCompartmentEditPart().getParent());
+		IGraphicalEditPart broadCastSignalActionEP = createChild(BroadcastSignalActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		IGraphicalEditPart acceptEventActionEP = createChild(AcceptEventActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+
+		Command endCommand = createLinkCommand(parameterNodeEP, broadCastSignalActionEP, UMLElementTypes.ControlFlow_4004);
+		Assert.assertNotNull(endCommand);
+		Assert.assertTrue(endCommand.canExecute());
+
+		executeOnUIThread(endCommand);
+		Assert.assertEquals(1, getDiagramEditPart().getConnections().size());
+		IGraphicalEditPart controlFlowConnection = (IGraphicalEditPart) getDiagramEditPart().getConnections().get(0);
+		Assert.assertTrue(controlFlowConnection instanceof ControlFlowEditPart);
+
+		ControlFlowEditPart controlFlowEP = (ControlFlowEditPart)controlFlowConnection;
+
+		ReconnectRequest reconnectTarget = getReconnectRequest(acceptEventActionEP, controlFlowEP, RequestConstants.REQ_RECONNECT_TARGET);
+
+		Command reorientTargetCommand = reconnectTarget.getTarget().getCommand(reconnectTarget);
+		Assert.assertNotNull(reorientTargetCommand);
+		Assert.assertTrue(reorientTargetCommand.canExecute());
+
+		executeOnUIThread(reorientTargetCommand);
+		Assert.assertEquals(acceptEventActionEP, controlFlowEP.getTarget());
+		
+		ReconnectRequest reconnectSource = getReconnectRequest(broadCastSignalActionEP, controlFlowEP, RequestConstants.REQ_RECONNECT_SOURCE);
+
+		Command reorientSourceCommand = reconnectSource.getTarget().getCommand(reconnectSource);
+		Assert.assertNotNull(reorientSourceCommand);
+		Assert.assertTrue(reorientSourceCommand.canExecute());
+
+		executeOnUIThread(reorientSourceCommand);
+		Assert.assertEquals(acceptEventActionEP, controlFlowEP.getTarget());
+	}
+
+	protected ReconnectRequest getReconnectRequest(IGraphicalEditPart targetEP, ConnectionEditPart connectionEP, String reqType) {
+		ReconnectRequest reconnect = new ReconnectRequest();
+		reconnect.setTargetEditPart(targetEP);
+		reconnect.setConnectionEditPart(connectionEP);
+		reconnect.setType(reqType);
+		return reconnect;
+	}
+}
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF
index 906aec9bac5..feacb8c1470 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF
@@ -4,6 +4,7 @@ Require-Bundle: org.eclipse.ui,
  org.junit,
  org.eclipse.emf.transaction,
  org.eclipse.ui.ide,
+ org.eclipse.papyrus.uml.tools.utils,
  org.eclipse.papyrus.junit.framework;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",
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/MultiplicityStringFormatterTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/MultiplicityStringFormatterTestCase.java
new file mode 100644
index 00000000000..c1ed2c8acab
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/MultiplicityStringFormatterTestCase.java
@@ -0,0 +1,236 @@
+package org.eclipse.papyrus.uml.diagram.common.tests.parser;

+

+import static org.junit.Assert.assertEquals;

+

+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

+import org.eclipse.papyrus.uml.tools.utils.MultiplicityElementUtil;

+import org.eclipse.uml2.uml.LiteralInteger;

+import org.eclipse.uml2.uml.LiteralString;

+import org.eclipse.uml2.uml.LiteralUnlimitedNatural;

+import org.eclipse.uml2.uml.MultiplicityElement;

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

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.ValueSpecification;

+import org.junit.Assert;

+import org.junit.Test;

+

+public class MultiplicityStringFormatterTestCase extends AbstractPapyrusTest {

+

+	private UMLFactory factory;

+

+	@Test

+	public void testMultiplicityLiteralLowerUpper() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(1), createLiteralUnlimitedNatural(5));

+		Assert.assertEquals("1..5", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityIntValues() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), 1, 5);

+		assertEquals("1..5", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityInfinityIntRange() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), 1, -1);

+		assertEquals("1..*", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityInfinityLiteralRange() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(1), createLiteralUnlimitedNatural(-1));

+		assertEquals("1..*", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityInfinityLiteral() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(0), createLiteralUnlimitedNatural(-1));

+		assertEquals("*", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityInfinity() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), 0, -1);

+		assertEquals("*", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityEqualsLiteralLowerUpper() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(1), createLiteralUnlimitedNatural(1));

+		assertEquals("1", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityLiteralLowerEqualsUpperWithBrackets() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(2), createLiteralUnlimitedNatural(2));

+		assertEquals("[2]", getMultiplicityWithBrackets(element).trim());

+	}

+

+	@Test

+	public void testMultiplicityLowerEqualsUpperWithBrackets() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), 2, 2);

+		assertEquals("[2]", getMultiplicityWithBrackets(element).trim());

+	}

+

+	@Test

+	public void testMultiplicityStringLiteralEqualsWithBrackets() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("EXACT"), createLiteralString("EXACT"));

+		assertEquals("[EXACT]", getMultiplicityWithBrackets(element).trim());

+	}

+

+	@Test

+	public void testMultiplicityLiteralLowerIsNull() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), null, createLiteralString("UPPER"));

+		assertEquals("1..UPPER", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityLiteralUpperIsNull() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), null);

+		assertEquals("LOWER..1", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityLiteralLowerIntUpper() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), 20);

+		assertEquals("LOWER..20", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityStringLiteralLowerIntLiteralUpper() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), createLiteralUnlimitedNatural(20));

+		assertEquals("LOWER..20", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityIntLiteralLowerStringLiteralUpper() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(10), createLiteralString("UPPER"));

+		assertEquals("10..UPPER", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityIntLowerStringLiteralUpper() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), 10, createLiteralString("UPPER"));

+		assertEquals("10..UPPER", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityStringLiteralLowerLiteralInfinity() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), createLiteralUnlimitedNatural(-1));

+		assertEquals("LOWER..*", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityStringLiteralLowerInfinity() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), -1);

+		assertEquals("LOWER..*", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityIntLowerStringUpper() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(1), createLiteralString("1"));

+		assertEquals("1", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityInfinityIntLowerStringUpper() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(-1), createLiteralString("1"));

+		assertEquals("-1..1", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityInfinityLowerUpper() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), -1, -1);

+		assertEquals("-1", getMultiplicityWithoutBrackets(element));

+	}

+	

+	@Test

+	public void testMultiplicityIntLowerIntUpperInfinity() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), -2, -1);

+		assertEquals("-2..*", getMultiplicityWithoutBrackets(element));

+	}

+	

+	@Test

+	public void testMultiplicityInfinityIntLowerIntUpper() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), -1, 1);

+		assertEquals("-1..1", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityDefault() {

+		assertEquals("1", getMultiplicityWithoutBrackets(createProperty()));

+	}

+

+	@Test

+	public void testMultiplicityStringLowerUpper() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), createLiteralString("UPPER"));

+		assertEquals("LOWER..UPPER", getMultiplicityWithoutBrackets(element));

+	}

+

+	@Test

+	public void testMultiplicityStringInfinityLowerUpper() {

+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("*"), createLiteralString("UPPER"));

+		assertEquals("", getMultiplicityWithoutBrackets(element));

+	}

+

+	private Property createProperty() {

+		return getFactory().createProperty();

+	}

+

+	private UMLFactory getFactory() {

+		if (factory == null) {

+			factory = UMLFactory.eINSTANCE;

+		}

+		return factory;

+	}

+

+	private String getMultiplicityWithoutBrackets(MultiplicityElement element) {

+		return MultiplicityElementUtil.formatMultiplicityNoBrackets(element);

+	}

+

+	private String getMultiplicityWithBrackets(MultiplicityElement element) {

+		return MultiplicityElementUtil.getMultiplicityAsString(element);

+	}

+

+	private MultiplicityElement setupMultiplicityElement(MultiplicityElement element, ValueSpecification lower, ValueSpecification upper) {

+		element.setLowerValue(lower);

+		element.setUpperValue(upper);

+		return element;

+	}

+

+	private MultiplicityElement setupMultiplicityElement(MultiplicityElement element, int lower, int upper) {

+		element.setLower(lower);

+		element.setUpper(upper);

+		return element;

+	}

+

+	private MultiplicityElement setupMultiplicityElement(MultiplicityElement element, ValueSpecification lower, int upper) {

+		element.setLowerValue(lower);

+		element.setUpper(upper);

+		return element;

+	}

+

+	private MultiplicityElement setupMultiplicityElement(MultiplicityElement element, int lower, ValueSpecification upper) {

+		element.setLower(lower);

+		element.setUpperValue(upper);

+		return element;

+	}

+

+	private LiteralInteger createLiteralInteger(int value) {

+		LiteralInteger result = getFactory().createLiteralInteger();

+		result.setValue(value);

+		return result;

+	}

+

+	private LiteralUnlimitedNatural createLiteralUnlimitedNatural(int value) {

+		LiteralUnlimitedNatural result = getFactory().createLiteralUnlimitedNatural();

+		result.setValue(value);

+		return result;

+	}

+

+	private LiteralString createLiteralString(String value) {

+		LiteralString result = getFactory().createLiteralString();

+		result.setValue(value);

+		return result;

+	}

+}

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/ValueSpecificationUtilTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/ValueSpecificationUtilTestCase.java
new file mode 100644
index 00000000000..90bbdf2927e
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/ValueSpecificationUtilTestCase.java
@@ -0,0 +1,108 @@
+package org.eclipse.papyrus.uml.diagram.common.tests.parser;

+

+import static org.junit.Assert.assertEquals;

+

+import org.eclipse.papyrus.junit.framework.classification.FailingTest;

+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

+import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;

+import org.eclipse.uml2.uml.LiteralBoolean;

+import org.eclipse.uml2.uml.LiteralInteger;

+import org.eclipse.uml2.uml.LiteralNull;

+import org.eclipse.uml2.uml.LiteralReal;

+import org.eclipse.uml2.uml.LiteralString;

+import org.eclipse.uml2.uml.LiteralUnlimitedNatural;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.junit.Assert;

+import org.junit.Test;

+

+public class ValueSpecificationUtilTestCase extends AbstractPapyrusTest {

+

+	private UMLFactory factory;

+

+	@Test

+	public void testLiteralInteger() {

+		Assert.assertEquals("1", ValueSpecificationUtil.getSpecificationValue(createLiteralInteger(1)));

+	}

+

+	@Test

+	public void testLiteralIntegerNegative() {

+		Assert.assertEquals("-1", ValueSpecificationUtil.getSpecificationValue(createLiteralInteger(-1)));

+	}

+

+	@Test

+	public void testLiteralUnlimitedNaturalInfinitive() {

+		assertEquals("*", ValueSpecificationUtil.getSpecificationValue(createLiteralUnlimitedNatural(-1)));

+	}

+

+	@Test

+	public void testLiteralUnlimitedNatural() {

+		assertEquals("100", ValueSpecificationUtil.getSpecificationValue(createLiteralUnlimitedNatural(100)));

+	}

+

+	@Test

+	public void testLiteralString() {

+		assertEquals("EXACT", ValueSpecificationUtil.getSpecificationValue(createLiteralString("EXACT")));

+	}

+

+	@Test

+	public void testLiteralBoolean() {

+		Assert.assertEquals("true", ValueSpecificationUtil.getSpecificationValue(createLiteralBoolean(true)));

+	}

+

+	@Test

+	public void testLiteralBooleanFalse() {

+		Assert.assertEquals("false", ValueSpecificationUtil.getSpecificationValue(createLiteralBoolean(false)));

+	}

+

+	@Test

+	public void testLiteralNull() {

+		assertEquals("", ValueSpecificationUtil.getSpecificationValue(createLiteralNull()));

+	}

+

+	@FailingTest

+	@Test

+	public void testLiteralReal() {

+		assertEquals("0.5", ValueSpecificationUtil.getSpecificationValue(createLiteralReal(0.5)));

+	}

+

+	private UMLFactory getFactory() {

+		if (factory == null) {

+			factory = UMLFactory.eINSTANCE;

+		}

+		return factory;

+	}

+

+	private LiteralInteger createLiteralInteger(int value) {

+		LiteralInteger result = getFactory().createLiteralInteger();

+		result.setValue(value);

+		return result;

+	}

+

+	private LiteralUnlimitedNatural createLiteralUnlimitedNatural(int value) {

+		LiteralUnlimitedNatural result = getFactory().createLiteralUnlimitedNatural();

+		result.setValue(value);

+		return result;

+	}

+

+	private LiteralString createLiteralString(String value) {

+		LiteralString result = getFactory().createLiteralString();

+		result.setValue(value);

+		return result;

+	}

+

+	private LiteralBoolean createLiteralBoolean(boolean value) {

+		LiteralBoolean result = getFactory().createLiteralBoolean();

+		result.setValue(value);

+		return result;

+	}

+

+	private LiteralNull createLiteralNull() {

+		return getFactory().createLiteralNull();

+	}

+

+	private LiteralReal createLiteralReal(double value) {

+		LiteralReal result = getFactory().createLiteralReal();

+		result.setValue(value);

+		return result;

+	}

+}

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/AllTests.java
index 0549789ea71..6edd9ec9dbb 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/AllTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/AllTests.java
@@ -17,12 +17,15 @@ package org.eclipse.papyrus.uml.diagram.common.tests.tests;
 import org.eclipse.papyrus.uml.diagram.common.tests.css.Bug431694_UndoDeleteTest;
 import org.eclipse.papyrus.uml.diagram.common.tests.parser.HTMLCleanerTestCase;
 import org.eclipse.papyrus.uml.diagram.common.tests.parser.HTMLCornerBentFigureTestCase;
+import org.eclipse.papyrus.uml.diagram.common.tests.parser.MultiplicityStringFormatterTestCase;
+import org.eclipse.papyrus.uml.diagram.common.tests.parser.ValueSpecificationUtilTestCase;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({ CommonBendpointsTest.class, HTMLCleanerTestCase.class, HTMLCornerBentFigureTestCase.class, Bug431694_UndoDeleteTest.class, Bug418509_ReorientationAssociation.class })
+@SuiteClasses({ CommonBendpointsTest.class, HTMLCleanerTestCase.class, HTMLCornerBentFigureTestCase.class, Bug431694_UndoDeleteTest.class, Bug418509_ReorientationAssociation.class, MultiplicityStringFormatterTestCase.class,
+		ValueSpecificationUtilTestCase.class })
 public class AllTests {
 	// JUnit 4 test suite
 }
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestLinks.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestLinks.java
index d49223d17f8..02ec44a316a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestLinks.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestLinks.java
@@ -17,10 +17,13 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.gef.EditPart;
 import org.eclipse.gef.RequestConstants;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool;
@@ -40,6 +43,7 @@ import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTermin
 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;
 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
 import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.uml2.uml.UMLPackage;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -103,6 +107,7 @@ public class TestLinks extends BaseTestCase {
 		Assert.assertEquals(1, getDiagramEditPart().getConnections().size());
 		IGraphicalEditPart constraintConnection = (IGraphicalEditPart) getDiagramEditPart().getConnections().get(0);
 		Assert.assertTrue(constraintConnection instanceof ConstraintConstrainedElementEditPart);
+		checkListFeatureLinkConnection((ConstraintConstrainedElementEditPart)constraintConnection, UMLPackage.eINSTANCE.getConstraint_ConstrainedElement());
 	}
 
 	@Test
@@ -118,6 +123,7 @@ public class TestLinks extends BaseTestCase {
 		Assert.assertEquals(1, getDiagramEditPart().getConnections().size());
 		IGraphicalEditPart contextConnection = (IGraphicalEditPart) getDiagramEditPart().getConnections().get(0);
 		Assert.assertTrue(contextConnection instanceof ContextLinkEditPart);
+		checkElementFeatureLinkConnection((ContextLinkEditPart)contextConnection, UMLPackage.eINSTANCE.getConstraint_Context());
 	}
 	
 
@@ -134,6 +140,7 @@ public class TestLinks extends BaseTestCase {
 		Assert.assertEquals(1, getDiagramEditPart().getConnections().size());
 		IGraphicalEditPart transitionConnection = (IGraphicalEditPart) getDiagramEditPart().getConnections().get(0);
 		Assert.assertTrue(transitionConnection instanceof TransitionEditPart);
+		Assert.assertEquals(transitionConnection.resolveSemanticElement().eContainer(), getRegionCompartmentEditPart().resolveSemanticElement());
 	}
 	
 	@Test
@@ -148,6 +155,9 @@ public class TestLinks extends BaseTestCase {
 		Assert.assertEquals(1, getDiagramEditPart().getConnections().size());
 		IGraphicalEditPart transitionConnection = (IGraphicalEditPart) getDiagramEditPart().getConnections().get(0);
 		Assert.assertTrue(transitionConnection instanceof TransitionEditPart);
+		TransitionEditPart transitionEP = (TransitionEditPart) transitionConnection;
+		checkSourceOfModelLink(transitionEP, stateEP, UMLPackage.eINSTANCE.getTransition_Source());
+		checkTargetOfModelLink(transitionEP, stateEP, UMLPackage.eINSTANCE.getTransition_Target());
 	}
 
 	@Test
@@ -161,6 +171,7 @@ public class TestLinks extends BaseTestCase {
 		Assert.assertEquals(1, getDiagramEditPart().getConnections().size());
 		IGraphicalEditPart commentConnection = (IGraphicalEditPart) getDiagramEditPart().getConnections().get(0);
 		Assert.assertTrue(commentConnection instanceof CommentAnnotatedElementEditPart);
+		checkListFeatureLinkConnection((CommentAnnotatedElementEditPart)commentConnection, UMLPackage.eINSTANCE.getComment_AnnotatedElement());
 	}
 
 	/**
@@ -244,9 +255,9 @@ public class TestLinks extends BaseTestCase {
 	@Test
 	public void testTransitionLinkReorient() {
 		IGraphicalEditPart stateEP = createChild(StateEditPart.VISUAL_ID, getRegionCompartmentEditPart());
-		IGraphicalEditPart pseustateEP = createChild(PseudostateJunctionEditPart.VISUAL_ID, getRegionCompartmentEditPart());
+		IGraphicalEditPart pseudostateEP = createChild(PseudostateJunctionEditPart.VISUAL_ID, getRegionCompartmentEditPart());
 
-		Command endCommand = createLinkCommand(pseustateEP, stateEP, UMLElementTypes.Transition_7000);
+		Command endCommand = createLinkCommand(pseudostateEP, stateEP, UMLElementTypes.Transition_7000);
 		Assert.assertNotNull(endCommand);
 		Assert.assertTrue(endCommand.canExecute());
 
@@ -254,16 +265,20 @@ public class TestLinks extends BaseTestCase {
 		Assert.assertEquals(1, getDiagramEditPart().getConnections().size());
 		IGraphicalEditPart transitionConnection = (IGraphicalEditPart) getDiagramEditPart().getConnections().get(0);
 		Assert.assertTrue(transitionConnection instanceof TransitionEditPart);
+		Assert.assertEquals(transitionConnection.resolveSemanticElement().eContainer(), getRegionCompartmentEditPart().resolveSemanticElement());
 
 		TransitionEditPart transitionEP = (TransitionEditPart)transitionConnection;
 
+		checkSourceOfModelLink(transitionEP, pseudostateEP, UMLPackage.eINSTANCE.getTransition_Source());
+		checkTargetOfModelLink(transitionEP, stateEP, UMLPackage.eINSTANCE.getTransition_Target());
+
 		ReconnectRequest reconnectSourceReq = getReconnectSource(transitionEP, stateEP);
 		doReconnect(reconnectSourceReq);
-		Assert.assertEquals(stateEP, transitionEP.getSource());
+		checkSourceOfModelLink(transitionEP, stateEP, UMLPackage.eINSTANCE.getTransition_Source());
 
-		ReconnectRequest reconnectTargetReq = getReconnectTarget(transitionEP, pseustateEP);
+		ReconnectRequest reconnectTargetReq = getReconnectTarget(transitionEP, pseudostateEP);
 		doReconnect(reconnectTargetReq);
-		Assert.assertEquals(stateEP, transitionEP.getSource());
+		checkTargetOfModelLink(transitionEP, pseudostateEP, UMLPackage.eINSTANCE.getTransition_Target());
 	}
 
 	@Test
@@ -289,6 +304,7 @@ public class TestLinks extends BaseTestCase {
 		Assert.assertTrue(commentConnection instanceof CommentAnnotatedElementEditPart);
 
 		CommentAnnotatedElementEditPart commentAnnotatedElementEP = (CommentAnnotatedElementEditPart)commentConnection;
+		checkListFeatureLinkConnection(commentAnnotatedElementEP, UMLPackage.eINSTANCE.getComment_AnnotatedElement());
 
 		ReconnectRequest reconnectSourceReq = getReconnectSource(commentAnnotatedElementEP, commentEP2);
 		doReconnect(reconnectSourceReq);
@@ -327,6 +343,7 @@ public class TestLinks extends BaseTestCase {
 		Assert.assertTrue(constraintConnection instanceof ConstraintConstrainedElementEditPart);
 
 		ConstraintConstrainedElementEditPart constraintConstrainedElementEP = (ConstraintConstrainedElementEditPart)constraintConnection;
+		checkListFeatureLinkConnection(constraintConstrainedElementEP, UMLPackage.eINSTANCE.getConstraint_ConstrainedElement());
 
 		ReconnectRequest reconnectSourceReq = getReconnectSource(constraintConstrainedElementEP, constraintEP2);
 		doReconnect(reconnectSourceReq);
@@ -367,6 +384,7 @@ public class TestLinks extends BaseTestCase {
 		Assert.assertTrue(constraintContextConnection instanceof ContextLinkEditPart);
 
 		ContextLinkEditPart constraintConstextEP = (ContextLinkEditPart)constraintContextConnection;
+		checkElementFeatureLinkConnection(constraintConstextEP, UMLPackage.eINSTANCE.getConstraint_Context());
 
 		ReconnectRequest reconnectSourceReq = getReconnectSource(constraintConstextEP, constraintEP2);
 		doReconnect(reconnectSourceReq);
@@ -385,4 +403,44 @@ public class TestLinks extends BaseTestCase {
 
 		Assert.assertEquals(stateEP, constraintConstextEP.getTarget());
 	}
+
+	public void checkSourceOfModelLink(ConnectionEditPart connEP, IGraphicalEditPart expectedEndEP, EReference endFeature) {
+		EditPart actualEndEP = connEP.getSource();	
+		checkEndOfModelLink(connEP, actualEndEP, expectedEndEP, endFeature);
+	}
+
+	public void checkTargetOfModelLink(ConnectionEditPart connEP, IGraphicalEditPart expectedEndEP, EReference endFeature) {
+		EditPart actualEndEP = connEP.getTarget();
+		checkEndOfModelLink(connEP, actualEndEP, expectedEndEP, endFeature);
+	}
+
+	public void checkEndOfModelLink(ConnectionEditPart connEP, EditPart actualEndEP, IGraphicalEditPart expectedEndEP, EReference endFeature) {
+		Assert.assertEquals(expectedEndEP, actualEndEP);
+
+		EObject connection = getLinkElement(connEP);
+		Object semanticSource = connection.eGet(endFeature);
+		Assert.assertEquals(expectedEndEP.resolveSemanticElement(), semanticSource);
+	}
+
+	private EObject getLinkElement(ConnectionEditPart connEP) {
+		EObject connection = connEP.resolveSemanticElement();
+		Assert.assertNotNull(connection);
+		return connection;
+	}
+
+	public void checkListFeatureLinkConnection(ConnectionEditPart connEP, EReference feature) {
+		EObject parent = ((IGraphicalEditPart) connEP.getSource()).resolveSemanticElement();
+		EObject child = ((IGraphicalEditPart) connEP.getTarget()).resolveSemanticElement();
+		
+		List<?> children = (List<?>)parent.eGet(feature);
+		Assert.assertTrue("FeatureLink " + connEP.getClass().getCanonicalName() + " does not appear semantic representation", children.contains(child));
+	}
+
+	public void checkElementFeatureLinkConnection(ConnectionEditPart connEP, EReference feature) {
+		EObject parent = ((IGraphicalEditPart) connEP.getSource()).resolveSemanticElement();
+		EObject child = ((IGraphicalEditPart) connEP.getTarget()).resolveSemanticElement();
+		
+		Object actualChild = parent.eGet(feature);
+		Assert.assertEquals("FeatureLink " + connEP.getClass().getCanonicalName() + " does not appear semantic representation", child, actualChild);
+	}
 }