Bug 510315: [UML-RT] UML specific implementation for state machines

Fix RCPTT tests by making façade label provider consistent with the UML-RT label provider. Remove deprecated APIs. Add qualified name attribute to façade. https://bugs.eclipse.org/bugs/show_bug.cgi?id=510315 Change-Id: I9352fb57097a31545b5d6e222229780b08cb0d78
author: Christian W. Damus 2017-02-12 16:36:32 +0000
committer: Christian W. Damus 2017-02-12 16:38:42 +0000
commit: 9d24fc957e410c841e03d41061f2579d083d4559 (patch)
tree: fe950b9d276bec1f5841221537668a2ebe4557c2
parent: 2b1bc5cdf515fafacae02a7d67c456493097aa05 (diff)
download: org.eclipse.papyrus-rt-9d24fc957e410c841e03d41061f2579d083d4559.tar.gz
org.eclipse.papyrus-rt-9d24fc957e410c841e03d41061f2579d083d4559.tar.xz
org.eclipse.papyrus-rt-9d24fc957e410c841e03d41061f2579d083d4559.zip
10 files changed, 327 insertions, 59 deletions
diff --git a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/model/umlrt-facade.genmodel b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/model/umlrt-facade.genmodel
index 532f3cae1..fbbb3f8e2 100644
--- a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/model/umlrt-facade.genmodel
+++ b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/model/umlrt-facade.genmodel
@@ -93,6 +93,8 @@
           ecoreFeature="ecore:EAttribute umlrt.ecore#//NamedElement/inheritanceKind"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute umlrt.ecore#//NamedElement/name"
           key="true"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" createChild="false"
+          ecoreFeature="ecore:EAttribute umlrt.ecore#//NamedElement/qualifiedName"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute umlrt.ecore#//NamedElement/isInherited"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute umlrt.ecore#//NamedElement/isVirtualRedefinition"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute umlrt.ecore#//NamedElement/isRedefinition"/>
diff --git a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/model/umlrt-facade.uml b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/model/umlrt-facade.uml
index ab80b0250..d01a28a6b 100644
--- a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/model/umlrt-facade.uml
+++ b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/model/umlrt-facade.uml
@@ -27,11 +27,19 @@ from another context or redefinition of an inherited element.</body>
       <ownedAttribute xmi:id="NamedElement-name" name="name" isDerived="true">
         <ownedComment xmi:id="NamedElement-name-_ownedComment.0" annotatedElement="NamedElement-name">
           <body>The name of an element, corresponding to the name of the
-equivalent UML element.</body>
+underlying UML element.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="NamedElement-name-_lowerValue"/>
       </ownedAttribute>
+      <ownedAttribute xmi:id="NamedElement-qualifiedName" name="qualifiedName" isReadOnly="true" isDerived="true">
+        <ownedComment xmi:id="NamedElement-qualifiedName-_ownedComment.0" annotatedElement="NamedElement-qualifiedName">
+          <body>The qualified name of an element, corresponding to the qualified
+name of the underlying UML element.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="NamedElement-qualifiedName-_lowerValue"/>
+      </ownedAttribute>
       <ownedAttribute xmi:id="NamedElement-isInherited" name="isInherited" isReadOnly="true" isDerived="true">
         <ownedComment xmi:id="NamedElement-isInherited-_ownedComment.0" annotatedElement="NamedElement-isInherited">
           <body>Indication of whether the element is inherited from another context
@@ -2605,4 +2613,5 @@ the &lt;code>getPort()&lt;/code> operation is not supported.</body>
   <Ecore:EAttribute xmi:id="_3BV9kO0-EeaYCPbkBlCaTg" isTransient="true" isVolatile="true" base_Property="Transition-isInternal" attributeName="internal"/>
   <Ecore:EAttribute xmi:id="_2ZATwO1VEeaEzNecaa3MMQ" isTransient="true" isVolatile="true" base_Property="Trigger-isReceiveAnyMessage" attributeName="receiveAnyMessage"/>
   <Ecore:EDataType xmi:id="_AWtl0O7REea2FckRsJl-UA" instanceClassName="java.lang.IllegalStateException" base_PrimitiveType="IllegalStateException"/>
+  <standard:Metamodel xmi:id="_cWv0APFAEealv8CSp1Iqjg" base_Model="_0"/>
 </xmi:XMI>
diff --git a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/model/umlrt.ecore b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/model/umlrt.ecore
index 1dba7aca1..f02e36705 100644
--- a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/model/umlrt.ecore
+++ b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/model/umlrt.ecore
@@ -103,7 +103,14 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"
         volatile="true" transient="true" derived="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of an element, corresponding to the name of the&#xA;equivalent UML element."/>
+        <details key="documentation" value="The name of an element, corresponding to the name of the&#xA;underlying UML element."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" ordered="false"
+        eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"
+        changeable="false" volatile="true" transient="true" derived="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The qualified name of an element, corresponding to the qualified&#xA;name of the underlying UML element."/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isInherited" ordered="false"
diff --git a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src-facade/org/eclipse/papyrusrt/umlrt/uml/UMLRTNamedElement.java b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src-facade/org/eclipse/papyrusrt/umlrt/uml/UMLRTNamedElement.java
index eef08620a..c2b091cba 100644
--- a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src-facade/org/eclipse/papyrusrt/umlrt/uml/UMLRTNamedElement.java
+++ b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src-facade/org/eclipse/papyrusrt/umlrt/uml/UMLRTNamedElement.java
@@ -30,6 +30,7 @@ import org.eclipse.uml2.uml.NamedElement;
  * <li>{@link org.eclipse.papyrusrt.umlrt.uml.UMLRTNamedElement#getModel <em>Model</em>}</li>
  * <li>{@link org.eclipse.papyrusrt.umlrt.uml.UMLRTNamedElement#getInheritanceKind <em>Inheritance Kind</em>}</li>
  * <li>{@link org.eclipse.papyrusrt.umlrt.uml.UMLRTNamedElement#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrusrt.umlrt.uml.UMLRTNamedElement#getQualifiedName <em>Qualified Name</em>}</li>
  * <li>{@link org.eclipse.papyrusrt.umlrt.uml.UMLRTNamedElement#isInherited <em>Is Inherited</em>}</li>
  * <li>{@link org.eclipse.papyrusrt.umlrt.uml.UMLRTNamedElement#isVirtualRedefinition <em>Is Virtual Redefinition</em>}</li>
  * <li>{@link org.eclipse.papyrusrt.umlrt.uml.UMLRTNamedElement#isRedefinition <em>Is Redefinition</em>}</li>
@@ -84,7 +85,7 @@ public interface UMLRTNamedElement extends FacadeObject {
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * The name of an element, corresponding to the name of the
-	 * equivalent UML element.
+	 * underlying UML element.
 	 * <!-- end-model-doc -->
 	 *
 	 * @return the value of the '<em>Name</em>' attribute.
@@ -107,6 +108,21 @@ public interface UMLRTNamedElement extends FacadeObject {
 	void setName(String value);
 
 	/**
+	 * Returns the value of the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The qualified name of an element, corresponding to the qualified
+	 * name of the underlying UML element.
+	 * <!-- end-model-doc -->
+	 *
+	 * @return the value of the '<em>Qualified Name</em>' attribute.
+	 * @see org.eclipse.papyrusrt.umlrt.uml.internal.facade.UMLRTUMLRTPackage#getNamedElement_QualifiedName()
+	 * @generated
+	 */
+	String getQualifiedName();
+
+	/**
 	 * Returns the value of the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src-facade/org/eclipse/papyrusrt/umlrt/uml/internal/facade/UMLRTUMLRTPackage.java b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src-facade/org/eclipse/papyrusrt/umlrt/uml/internal/facade/UMLRTUMLRTPackage.java
index 15e7c19ae..e991f8096 100644
--- a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src-facade/org/eclipse/papyrusrt/umlrt/uml/internal/facade/UMLRTUMLRTPackage.java
+++ b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src-facade/org/eclipse/papyrusrt/umlrt/uml/internal/facade/UMLRTUMLRTPackage.java
@@ -113,6 +113,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int NAMED_ELEMENT__NAME = 2;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int NAMED_ELEMENT__QUALIFIED_NAME = 3;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -120,7 +130,7 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT__IS_INHERITED = 3;
+	int NAMED_ELEMENT__IS_INHERITED = 4;
 
 	/**
 	 * The feature id for the '<em><b>Is Virtual Redefinition</b></em>' attribute.
@@ -130,7 +140,7 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT__IS_VIRTUAL_REDEFINITION = 4;
+	int NAMED_ELEMENT__IS_VIRTUAL_REDEFINITION = 5;
 
 	/**
 	 * The feature id for the '<em><b>Is Redefinition</b></em>' attribute.
@@ -140,7 +150,7 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT__IS_REDEFINITION = 5;
+	int NAMED_ELEMENT__IS_REDEFINITION = 6;
 
 	/**
 	 * The feature id for the '<em><b>Is Excluded</b></em>' attribute.
@@ -150,7 +160,7 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT__IS_EXCLUDED = 6;
+	int NAMED_ELEMENT__IS_EXCLUDED = 7;
 
 	/**
 	 * The feature id for the '<em><b>Redefined Element</b></em>' reference.
@@ -160,7 +170,7 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT__REDEFINED_ELEMENT = 7;
+	int NAMED_ELEMENT__REDEFINED_ELEMENT = 8;
 
 	/**
 	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference.
@@ -170,7 +180,7 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT__REDEFINITION_CONTEXT = 8;
+	int NAMED_ELEMENT__REDEFINITION_CONTEXT = 9;
 
 	/**
 	 * The feature id for the '<em><b>Redefinable Element</b></em>' reference list.
@@ -180,7 +190,7 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT__REDEFINABLE_ELEMENT = 9;
+	int NAMED_ELEMENT__REDEFINABLE_ELEMENT = 10;
 
 	/**
 	 * The feature id for the '<em><b>Inherited Element</b></em>' reference.
@@ -190,7 +200,7 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT__INHERITED_ELEMENT = 10;
+	int NAMED_ELEMENT__INHERITED_ELEMENT = 11;
 
 	/**
 	 * The feature id for the '<em><b>Root Definition</b></em>' reference.
@@ -200,7 +210,7 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT__ROOT_DEFINITION = 11;
+	int NAMED_ELEMENT__ROOT_DEFINITION = 12;
 
 	/**
 	 * The feature id for the '<em><b>Excluded Element</b></em>' reference list.
@@ -210,7 +220,7 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT__EXCLUDED_ELEMENT = 12;
+	int NAMED_ELEMENT__EXCLUDED_ELEMENT = 13;
 
 	/**
 	 * The number of structural features of the '<em>Named Element</em>' class.
@@ -220,7 +230,7 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT_FEATURE_COUNT = 13;
+	int NAMED_ELEMENT_FEATURE_COUNT = 14;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrusrt.umlrt.uml.internal.facade.impl.UMLRTPackageImpl <em>Package</em>}' class.
@@ -264,6 +274,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int PACKAGE__NAME = NAMED_ELEMENT__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int PACKAGE__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -455,6 +475,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int CLASSIFIER__NAME = NAMED_ELEMENT__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CLASSIFIER__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -626,6 +656,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int CAPSULE__NAME = CLASSIFIER__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CAPSULE__QUALIFIED_NAME = CLASSIFIER__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -888,6 +928,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int REPLICATED_ELEMENT__NAME = NAMED_ELEMENT__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int REPLICATED_ELEMENT__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1069,6 +1119,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int PORT__NAME = REPLICATED_ELEMENT__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__QUALIFIED_NAME = REPLICATED_ELEMENT__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1429,6 +1489,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int PROTOCOL__NAME = CLASSIFIER__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL__QUALIFIED_NAME = CLASSIFIER__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1722,6 +1792,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int PROTOCOL_MESSAGE__NAME = NAMED_ELEMENT__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_MESSAGE__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1922,6 +2002,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int CAPSULE_PART__NAME = REPLICATED_ELEMENT__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CAPSULE_PART__QUALIFIED_NAME = REPLICATED_ELEMENT__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2142,6 +2232,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int CONNECTOR__NAME = NAMED_ELEMENT__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTOR__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2373,6 +2473,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int STATE_MACHINE__NAME = NAMED_ELEMENT__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2564,6 +2674,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int VERTEX__NAME = NAMED_ELEMENT__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VERTEX__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2765,6 +2885,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int STATE__NAME = VERTEX__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__QUALIFIED_NAME = VERTEX__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -3036,6 +3166,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int TRANSITION__NAME = NAMED_ELEMENT__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int TRANSITION__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -3277,6 +3417,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int TRIGGER__NAME = NAMED_ELEMENT__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int TRIGGER__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -3488,6 +3638,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int GUARD__NAME = NAMED_ELEMENT__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int GUARD__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -3659,6 +3819,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int CONNECTION_POINT__NAME = VERTEX__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION_POINT__QUALIFIED_NAME = VERTEX__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -3880,6 +4050,16 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	int PSEUDOSTATE__NAME = VERTEX__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE__QUALIFIED_NAME = VERTEX__QUALIFIED_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Is Inherited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -4221,6 +4401,18 @@ public interface UMLRTUMLRTPackage extends EPackage {
 	EAttribute getNamedElement_Name();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrusrt.umlrt.uml.UMLRTNamedElement#getQualifiedName <em>Qualified Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Qualified Name</em>'.
+	 * @see org.eclipse.papyrusrt.umlrt.uml.UMLRTNamedElement#getQualifiedName()
+	 * @see #getNamedElement()
+	 * @generated
+	 */
+	EAttribute getNamedElement_QualifiedName();
+
+	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrusrt.umlrt.uml.UMLRTNamedElement#isInherited <em>Is Inherited</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -5924,6 +6116,15 @@ public interface UMLRTUMLRTPackage extends EPackage {
 		EAttribute NAMED_ELEMENT__NAME = eINSTANCE.getNamedElement_Name();
 
 		/**
+		 * The meta object literal for the '<em><b>Qualified Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute NAMED_ELEMENT__QUALIFIED_NAME = eINSTANCE.getNamedElement_QualifiedName();
+
+		/**
 		 * The meta object literal for the '<em><b>Is Inherited</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src-facade/org/eclipse/papyrusrt/umlrt/uml/internal/facade/impl/UMLRTNamedElementImpl.java b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src-facade/org/eclipse/papyrusrt/umlrt/uml/internal/facade/impl/UMLRTNamedElementImpl.java
index a69172ebe..7e12e677c 100644
--- a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src-facade/org/eclipse/papyrusrt/umlrt/uml/internal/facade/impl/UMLRTNamedElementImpl.java
+++ b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src-facade/org/eclipse/papyrusrt/umlrt/uml/internal/facade/impl/UMLRTNamedElementImpl.java
@@ -59,6 +59,7 @@ import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
  * <li>{@link org.eclipse.papyrusrt.umlrt.uml.internal.facade.impl.UMLRTNamedElementImpl#getModel <em>Model</em>}</li>
  * <li>{@link org.eclipse.papyrusrt.umlrt.uml.internal.facade.impl.UMLRTNamedElementImpl#getInheritanceKind <em>Inheritance Kind</em>}</li>
  * <li>{@link org.eclipse.papyrusrt.umlrt.uml.internal.facade.impl.UMLRTNamedElementImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrusrt.umlrt.uml.internal.facade.impl.UMLRTNamedElementImpl#getQualifiedName <em>Qualified Name</em>}</li>
  * <li>{@link org.eclipse.papyrusrt.umlrt.uml.internal.facade.impl.UMLRTNamedElementImpl#isInherited <em>Is Inherited</em>}</li>
  * <li>{@link org.eclipse.papyrusrt.umlrt.uml.internal.facade.impl.UMLRTNamedElementImpl#isVirtualRedefinition <em>Is Virtual Redefinition</em>}</li>
  * <li>{@link org.eclipse.papyrusrt.umlrt.uml.internal.facade.impl.UMLRTNamedElementImpl#isRedefinition <em>Is Redefinition</em>}</li>
@@ -115,6 +116,17 @@ public abstract class UMLRTNamedElementImpl extends FacadeObjectImpl implements
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
+	 * The default value of the '{@link #getQualifiedName() <em>Qualified Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getQualifiedName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String QUALIFIED_NAME_EDEFAULT = null;
+
+	/**
 	 * The default value of the '{@link #isInherited() <em>Is Inherited</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -329,6 +341,17 @@ public abstract class UMLRTNamedElementImpl extends FacadeObjectImpl implements
 	 * @generated NOT
 	 */
 	@Override
+	public String getQualifiedName() {
+		return toUML().getQualifiedName();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
 	public boolean isInherited() {
 		return getInheritanceKind() != UMLRTInheritanceKind.NONE;
 	}
@@ -646,6 +669,8 @@ public abstract class UMLRTNamedElementImpl extends FacadeObjectImpl implements
 			return getInheritanceKind();
 		case UMLRTUMLRTPackage.NAMED_ELEMENT__NAME:
 			return getName();
+		case UMLRTUMLRTPackage.NAMED_ELEMENT__QUALIFIED_NAME:
+			return getQualifiedName();
 		case UMLRTUMLRTPackage.NAMED_ELEMENT__IS_INHERITED:
 			return isInherited();
 		case UMLRTUMLRTPackage.NAMED_ELEMENT__IS_VIRTUAL_REDEFINITION:
@@ -717,6 +742,8 @@ public abstract class UMLRTNamedElementImpl extends FacadeObjectImpl implements
 			return getInheritanceKind() != INHERITANCE_KIND_EDEFAULT;
 		case UMLRTUMLRTPackage.NAMED_ELEMENT__NAME:
 			return NAME_EDEFAULT == null ? getName() != null : !NAME_EDEFAULT.equals(getName());
+		case UMLRTUMLRTPackage.NAMED_ELEMENT__QUALIFIED_NAME:
+			return QUALIFIED_NAME_EDEFAULT == null ? getQualifiedName() != null : !QUALIFIED_NAME_EDEFAULT.equals(getQualifiedName());
 		case UMLRTUMLRTPackage.NAMED_ELEMENT__IS_INHERITED:
 			return isInherited() != IS_INHERITED_EDEFAULT;
 		case UMLRTUMLRTPackage.NAMED_ELEMENT__IS_VIRTUAL_REDEFINITION:
diff --git a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src-facade/org/eclipse/papyrusrt/umlrt/uml/internal/facade/impl/UMLRTUMLRTPackageImpl.java b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src-facade/org/eclipse/papyrusrt/umlrt/uml/internal/facade/impl/UMLRTUMLRTPackageImpl.java
index 8967c279a..672b9d6ce 100644
--- a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src-facade/org/eclipse/papyrusrt/umlrt/uml/internal/facade/impl/UMLRTUMLRTPackageImpl.java
+++ b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src-facade/org/eclipse/papyrusrt/umlrt/uml/internal/facade/impl/UMLRTUMLRTPackageImpl.java
@@ -421,7 +421,7 @@ public class UMLRTUMLRTPackageImpl extends EPackageImpl implements UMLRTUMLRTPac
 	 * @generated
 	 */
 	@Override
-	public EAttribute getNamedElement_IsInherited() {
+	public EAttribute getNamedElement_QualifiedName() {
 		return (EAttribute) namedElementEClass.getEStructuralFeatures().get(3);
 	}
 
@@ -433,7 +433,7 @@ public class UMLRTUMLRTPackageImpl extends EPackageImpl implements UMLRTUMLRTPac
 	 * @generated
 	 */
 	@Override
-	public EAttribute getNamedElement_IsVirtualRedefinition() {
+	public EAttribute getNamedElement_IsInherited() {
 		return (EAttribute) namedElementEClass.getEStructuralFeatures().get(4);
 	}
 
@@ -445,7 +445,7 @@ public class UMLRTUMLRTPackageImpl extends EPackageImpl implements UMLRTUMLRTPac
 	 * @generated
 	 */
 	@Override
-	public EAttribute getNamedElement_IsRedefinition() {
+	public EAttribute getNamedElement_IsVirtualRedefinition() {
 		return (EAttribute) namedElementEClass.getEStructuralFeatures().get(5);
 	}
 
@@ -457,7 +457,7 @@ public class UMLRTUMLRTPackageImpl extends EPackageImpl implements UMLRTUMLRTPac
 	 * @generated
 	 */
 	@Override
-	public EAttribute getNamedElement_IsExcluded() {
+	public EAttribute getNamedElement_IsRedefinition() {
 		return (EAttribute) namedElementEClass.getEStructuralFeatures().get(6);
 	}
 
@@ -469,8 +469,20 @@ public class UMLRTUMLRTPackageImpl extends EPackageImpl implements UMLRTUMLRTPac
 	 * @generated
 	 */
 	@Override
+	public EAttribute getNamedElement_IsExcluded() {
+		return (EAttribute) namedElementEClass.getEStructuralFeatures().get(7);
+	}
+
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public EReference getNamedElement_RedefinedElement() {
-		return (EReference) namedElementEClass.getEStructuralFeatures().get(7);
+		return (EReference) namedElementEClass.getEStructuralFeatures().get(8);
 	}
 
 
@@ -482,7 +494,7 @@ public class UMLRTUMLRTPackageImpl extends EPackageImpl implements UMLRTUMLRTPac
 	 */
 	@Override
 	public EReference getNamedElement_RedefinitionContext() {
-		return (EReference) namedElementEClass.getEStructuralFeatures().get(8);
+		return (EReference) namedElementEClass.getEStructuralFeatures().get(9);
 	}
 
 
@@ -494,7 +506,7 @@ public class UMLRTUMLRTPackageImpl extends EPackageImpl implements UMLRTUMLRTPac
 	 */
 	@Override
 	public EReference getNamedElement_RedefinableElement() {
-		return (EReference) namedElementEClass.getEStructuralFeatures().get(9);
+		return (EReference) namedElementEClass.getEStructuralFeatures().get(10);
 	}
 
 
@@ -506,7 +518,7 @@ public class UMLRTUMLRTPackageImpl extends EPackageImpl implements UMLRTUMLRTPac
 	 */
 	@Override
 	public EReference getNamedElement_InheritedElement() {
-		return (EReference) namedElementEClass.getEStructuralFeatures().get(10);
+		return (EReference) namedElementEClass.getEStructuralFeatures().get(11);
 	}
 
 
@@ -518,7 +530,7 @@ public class UMLRTUMLRTPackageImpl extends EPackageImpl implements UMLRTUMLRTPac
 	 */
 	@Override
 	public EReference getNamedElement_RootDefinition() {
-		return (EReference) namedElementEClass.getEStructuralFeatures().get(11);
+		return (EReference) namedElementEClass.getEStructuralFeatures().get(12);
 	}
 
 
@@ -530,7 +542,7 @@ public class UMLRTUMLRTPackageImpl extends EPackageImpl implements UMLRTUMLRTPac
 	 */
 	@Override
 	public EReference getNamedElement_ExcludedElement() {
-		return (EReference) namedElementEClass.getEStructuralFeatures().get(12);
+		return (EReference) namedElementEClass.getEStructuralFeatures().get(13);
 	}
 
 
@@ -2098,6 +2110,7 @@ public class UMLRTUMLRTPackageImpl extends EPackageImpl implements UMLRTUMLRTPac
 		createEAttribute(namedElementEClass, NAMED_ELEMENT__MODEL);
 		createEAttribute(namedElementEClass, NAMED_ELEMENT__INHERITANCE_KIND);
 		createEAttribute(namedElementEClass, NAMED_ELEMENT__NAME);
+		createEAttribute(namedElementEClass, NAMED_ELEMENT__QUALIFIED_NAME);
 		createEAttribute(namedElementEClass, NAMED_ELEMENT__IS_INHERITED);
 		createEAttribute(namedElementEClass, NAMED_ELEMENT__IS_VIRTUAL_REDEFINITION);
 		createEAttribute(namedElementEClass, NAMED_ELEMENT__IS_REDEFINITION);
@@ -2325,6 +2338,7 @@ public class UMLRTUMLRTPackageImpl extends EPackageImpl implements UMLRTUMLRTPac
 		initEAttribute(getNamedElement_Model(), this.getModel(), "model", null, 1, 1, UMLRTNamedElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getNamedElement_InheritanceKind(), this.getUMLRTInheritanceKind(), "inheritanceKind", null, 1, 1, UMLRTNamedElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getNamedElement_Name(), theTypesPackage.getString(), "name", null, 0, 1, UMLRTNamedElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getNamedElement_QualifiedName(), theTypesPackage.getString(), "qualifiedName", null, 0, 1, UMLRTNamedElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getNamedElement_IsInherited(), theTypesPackage.getBoolean(), "isInherited", null, 1, 1, UMLRTNamedElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getNamedElement_IsVirtualRedefinition(), theTypesPackage.getBoolean(), "isVirtualRedefinition", null, 1, 1, UMLRTNamedElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getNamedElement_IsRedefinition(), theTypesPackage.getBoolean(), "isRedefinition", null, 1, 1, UMLRTNamedElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
diff --git a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src/org/eclipse/papyrusrt/umlrt/uml/util/UMLRTExtensionUtil.java b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src/org/eclipse/papyrusrt/umlrt/uml/util/UMLRTExtensionUtil.java
index 5cb37c3b2..36c5e9cd0 100644
--- a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src/org/eclipse/papyrusrt/umlrt/uml/util/UMLRTExtensionUtil.java
+++ b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml/src/org/eclipse/papyrusrt/umlrt/uml/util/UMLRTExtensionUtil.java
@@ -25,7 +25,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EContentsEList;
 import org.eclipse.papyrusrt.umlrt.uml.FacadeObject;
-import org.eclipse.papyrusrt.umlrt.uml.UMLRTNamedElement;
 import org.eclipse.papyrusrt.umlrt.uml.internal.impl.InternalUMLRTElement;
 import org.eclipse.papyrusrt.umlrt.uml.internal.umlext.ExtElement;
 import org.eclipse.papyrusrt.umlrt.uml.internal.umlext.ExtUMLExtPackage;
@@ -176,22 +175,6 @@ public class UMLRTExtensionUtil {
 	 * semantics of inheritance and incremental redefinition.
 	 * 
 	 * @param element
-	 *            an element
-	 * @return whether it is a virtual element
-	 * 
-	 * @deprecated Use the {@link #isVirtualElement(FacadeObject) API, instead
-	 */
-	@Deprecated
-	public static boolean isVirtualElement(UMLRTNamedElement element) {
-		return isVirtualElement(element.toUML());
-	}
-
-	/**
-	 * Queries whether an {@code element} is a virtual model element,
-	 * not actually present in the model but implied via the UML-RT
-	 * semantics of inheritance and incremental redefinition.
-	 * 
-	 * @param element
 	 *            an element of the façade
 	 * @return whether it is a virtual element
 	 */
@@ -225,21 +208,6 @@ public class UMLRTExtensionUtil {
 
 	/**
 	 * Runs an {@code action} that modifies some façade {@code element} without
-	 * affecting its {@linkplain #isVirtualElement(UMLRTNamedElement) real/virtual state}.
-	 * 
-	 * @param element
-	 *            a model element
-	 * @param action
-	 *            an action that modifies it in some way
-	 * @deprecated Use the {@link #run(FacadeObject, Runnable) API, instead
-	 */
-	@Deprecated
-	public static void run(UMLRTNamedElement element, Runnable action) {
-		run(element.toUML(), action);
-	}
-
-	/**
-	 * Runs an {@code action} that modifies some façade {@code element} without
 	 * affecting its {@linkplain #isVirtualElement(FacadeObject) real/virtual state}.
 	 * 
 	 * @param element
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/internal/providers/FacadeLabelProvider.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/internal/providers/FacadeLabelProvider.java
index 4d25bf7f3..889cc230f 100644
--- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/internal/providers/FacadeLabelProvider.java
+++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/internal/providers/FacadeLabelProvider.java
@@ -29,7 +29,8 @@ import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.ui.emf.providers.EMFFilteredLabelProvider;
 import org.eclipse.papyrus.uml.tools.providers.DelegatingItemLabelProvider;
 import org.eclipse.papyrusrt.umlrt.tooling.ui.Activator;
-import org.eclipse.papyrusrt.umlrt.uml.UMLRTNamedElement;
+import org.eclipse.papyrusrt.umlrt.uml.FacadeObject;
+import org.eclipse.papyrusrt.umlrt.uml.UMLRTProtocolMessage;
 import org.eclipse.papyrusrt.umlrt.uml.internal.facade.UMLRTUMLRTPackage;
 import org.eclipse.uml2.uml.MultiplicityElement;
 
@@ -78,9 +79,23 @@ public class FacadeLabelProvider extends EMFFilteredLabelProvider {
 
 	@Override
 	protected String getText(EObject element) {
-		if (element instanceof UMLRTNamedElement) {
+		if (element instanceof UMLRTProtocolMessage) {
+			// Special case for direction prefix
+			UMLRTProtocolMessage message = (UMLRTProtocolMessage) element;
+
+			switch (message.getKind()) {
+			case IN:
+				return "in " + getText(message.toUML());
+			case OUT:
+				return "out " + getText(message.toUML());
+			case IN_OUT:
+				return "inout " + getText(message.toUML());
+			default:
+				return getText(message.toUML());
+			}
+		} else if (element instanceof FacadeObject) {
 			// Delegate to UML
-			element = ((UMLRTNamedElement) element).toUML();
+			element = ((FacadeObject) element).toUML();
 		}
 
 		if (element instanceof MultiplicityElement) {
@@ -94,6 +109,7 @@ public class FacadeLabelProvider extends EMFFilteredLabelProvider {
 				getText(mult.getUpperValue());
 			}
 		}
+
 		return delegate.getText(element);
 	}
 
diff --git a/tests/junit/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml.tests/src/org/eclipse/papyrusrt/umlrt/uml/tests/CapsuleFacadeTest.java b/tests/junit/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml.tests/src/org/eclipse/papyrusrt/umlrt/uml/tests/CapsuleFacadeTest.java
index 3eb16c607..4ccac47a3 100644
--- a/tests/junit/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml.tests/src/org/eclipse/papyrusrt/umlrt/uml/tests/CapsuleFacadeTest.java
+++ b/tests/junit/umlrt/profile/org.eclipse.papyrusrt.umlrt.uml.tests/src/org/eclipse/papyrusrt/umlrt/uml/tests/CapsuleFacadeTest.java
@@ -59,6 +59,14 @@ public class CapsuleFacadeTest {
 
 	@Test
 	@TestModel("inheritance/ports.uml")
+	public void getQualifiedName() {
+		UMLRTCapsule capsule = UMLRTCapsule.getInstance(fixture.getElement("RootCapsule"));
+
+		assertThat(capsule.getQualifiedName(), is("ports::RootCapsule"));
+	}
+
+	@Test
+	@TestModel("inheritance/ports.uml")
 	public void getPorts() {
 		UMLRTCapsule capsule = UMLRTCapsule.getInstance(fixture.getElement("RootCapsule"));
author	Christian W. Damus	2017-02-12 16:36:32 +0000
committer	Christian W. Damus	2017-02-12 16:38:42 +0000
commit	9d24fc957e410c841e03d41061f2579d083d4559 (patch)
tree	fe950b9d276bec1f5841221537668a2ebe4557c2
parent	2b1bc5cdf515fafacae02a7d67c456493097aa05 (diff)
download	org.eclipse.papyrus-rt-9d24fc957e410c841e03d41061f2579d083d4559.tar.gz org.eclipse.papyrus-rt-9d24fc957e410c841e03d41061f2579d083d4559.tar.xz org.eclipse.papyrus-rt-9d24fc957e410c841e03d41061f2579d083d4559.zip