[478878] Migrating to AQL remaining legacy expressions

These expressions were not migrated either because the migration tooling
failed to detect those and/or launching the tests was not enough to
detect an issue (some were in documentation fields for instance)

It's still better to migrate those to AQL.

Bug: 478878
Change-Id: Ifb188b8e5d76800b5ddb33fa06caf624bf3c2cc6

7 files changed, 29 insertions, 29 deletions

diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction.odesign
index ede15df829..123dc1d431 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction.odesign
@@ -941,12 +941,12 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                 <subModelOperations xsi:type="tool_1:For" expression="aql:element.eInverse('context')" iteratorName="end">
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;ExecutionEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::ExecutionEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.execution">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;MessageEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::MessageEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.message">
                       <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd = end  and   self.receivingEnd = null">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -956,7 +956,7 @@
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;StateEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::StateEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.state">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
@@ -2714,12 +2714,12 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                 <subModelOperations xsi:type="tool_1:For" expression="aql:element.eInverse('context')" iteratorName="end">
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;ExecutionEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::ExecutionEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.execution">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;MessageEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::MessageEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.message">
                       <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd = end  and   self.receivingEnd = null">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -2729,7 +2729,7 @@
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;StateEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::StateEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.state">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
@@ -4487,12 +4487,12 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                 <subModelOperations xsi:type="tool_1:For" expression="aql:element.eInverse('context')" iteratorName="end">
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;ExecutionEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::ExecutionEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.execution">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;MessageEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::MessageEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.message">
                       <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd = end  and   self.receivingEnd = null">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -4502,7 +4502,7 @@
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;StateEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::StateEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.state">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction_modified.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction_modified.odesign
index f3bf3ab03a..5d0c886417 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction_modified.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction_modified.odesign
@@ -286,12 +286,12 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                 <subModelOperations xsi:type="tool_1:For" expression="aql:element.eInverse('context')" iteratorName="end">
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;ExecutionEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::ExecutionEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.execution">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;MessageEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::MessageEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.message">
                       <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd = end  and   self.receivingEnd = null">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -301,7 +301,7 @@
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;StateEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::StateEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.state">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
@@ -2714,12 +2714,12 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                 <subModelOperations xsi:type="tool_1:For" expression="aql:element.eInverse('context')" iteratorName="end">
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;ExecutionEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::ExecutionEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.execution">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;MessageEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::MessageEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.message">
                       <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd = end  and   self.receivingEnd = null">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -2729,7 +2729,7 @@
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;StateEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::StateEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.state">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
@@ -4487,12 +4487,12 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                 <subModelOperations xsi:type="tool_1:For" expression="aql:element.eInverse('context')" iteratorName="end">
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;ExecutionEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::ExecutionEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.execution">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;MessageEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::MessageEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.message">
                       <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd = end  and   self.receivingEnd = null">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -4502,7 +4502,7 @@
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;StateEnd&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:end.oclIsKindOf(interactions::StateEnd)">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.state">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/navigation/vp-1851/vp-1851.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/navigation/vp-1851/vp-1851.odesign
index 836720b2b1..ccf92128f5 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/navigation/vp-1851/vp-1851.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/navigation/vp-1851/vp-1851.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="VP-1851" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="VP-1851" version="10.1.3.201511131800">
   <ownedViewpoints name="VP-1851" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Source" domainClass="EPackage">
       <defaultLayer name="Default">
@@ -14,7 +14,7 @@
           <ownedTools xsi:type="tool:OperationAction" name="Test VP-1851">
             <view name="views"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%$views.nFirst().target.eContainer(&quot;EPackage&quot;)%>">
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:views->first().target.eContainerOrSelf(ecore::EPackage)">
                 <subModelOperations xsi:type="tool_1:Navigation" createIfNotExistent="true" diagramDescription="//@ownedViewpoints[name='VP-1851']/@ownedRepresentations[name='Target']"/>
               </firstModelOperations>
             </initialOperation>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign.old b/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign.old
index fbe8b3c61e..599b87481f 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign.old
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign.old
@@ -38,7 +38,7 @@
       </subItemMappings>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:TreeDescription" name="InfiniteRecursion" domainClass="EObject">
-      <subItemMappings name="Current EObject" domainClass="EObject " semanticCandidatesExpression="&lt;%self%>" reusedTreeItemMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='InfiniteRecursion']/@subItemMappings[name='Current%20EObject']">
+      <subItemMappings name="Current EObject" domainClass="EObject " semanticCandidatesExpression="aql:self" reusedTreeItemMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='InfiniteRecursion']/@subItemMappings[name='Current%20EObject']">
         <defaultStyle>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -46,12 +46,12 @@
       </subItemMappings>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:TreeDescription" name="InfiniteRecursion With Inheritance" domainClass="EObject">
-      <subItemMappings name="Current EObject Infinite" domainClass="EObject " semanticCandidatesExpression="&lt;%self%>">
+      <subItemMappings name="Current EObject Infinite" domainClass="EObject " semanticCandidatesExpression="aql:self">
         <defaultStyle>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
         </defaultStyle>
-        <subItemMappings name="Current EObject Infinite Specialized" domainClass="EObject" semanticCandidatesExpression="&lt;%self%>" specialize="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='InfiniteRecursion%20With%20Inheritance']/@subItemMappings[name='Current%20EObject%20Infinite']">
+        <subItemMappings name="Current EObject Infinite Specialized" domainClass="EObject" semanticCandidatesExpression="aql:self" specialize="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='InfiniteRecursion%20With%20Inheritance']/@subItemMappings[name='Current%20EObject%20Infinite']">
           <defaultStyle>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -60,7 +60,7 @@
       </subItemMappings>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:TreeDescription" name="PreconditionOnMappings" domainClass="EPackage">
-      <subItemMappings name="EClasses" domainClass="Abstract EClass by Precondition" preconditionExpression="&lt;%$view.target[isAbstract]%>" semanticCandidatesExpression="aql:self.eContents()">
+      <subItemMappings name="EClasses" domainClass="Abstract EClass by Precondition" preconditionExpression="aql:view.target.isAbstract" semanticCandidatesExpression="aql:self.eContents()">
         <defaultStyle>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/tc931/uml2.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/tc931/uml2.odesign
index 37fd652e8c..dcd52cf3fe 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/tc931/uml2.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/tc931/uml2.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" documentation="uml2 modeler" name="UML2 modelers" version="10.1.0.201507271600">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" documentation="uml2 modeler" name="UML2 modelers" version="10.1.3.201511131800">
   <ownedViewpoints name="UML Behavioral Modeling" modelFileExtension="uml">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Activity Diagram" titleExpression="aql:self.name + ' Activity Diagram'" domainClass="Activity">
       <defaultLayer name="Activity">
@@ -13,7 +13,7 @@
           <conditionnalStyles predicateExpression="aql:self.guard &lt;> null  and  source.oclIsKindOf(uml::DecisionNode)">
             <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="" routingStyle="manhattan">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_orange']"/>
-              <centerLabelStyleDescription showIcon="false" labelExpression="[&lt;%guard.body.nFirst()%>]">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:'[' + self.guard.body->first() + ']'">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
@@ -263,7 +263,7 @@
               <initialOperation>
                 <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="CallOperationAction" referenceName="node">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="var:element"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%$element.name%>(&lt;%for ($element.ownedParameter[direction != &quot;return&quot;]).sep(&quot;, &quot;){%>&lt;%type.name%>&lt;%}%>)&lt;%if ($element.type != null) {%> : &lt;%$element.type.name%>&lt;%}%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:element.name + '(' + element.ownedParameter->select(p | p.direction &lt;> 'return').type.name->sep(',')  + if element.type &lt;> null then ' : ' + element.type.name else '' endif"/>
                 </firstModelOperations>
               </initialOperation>
             </ownedTools>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/validation/ticket1666.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/validation/ticket1666.odesign
index 08d7403f20..f522d0f7d9 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/validation/ticket1666.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/validation/ticket1666.odesign
@@ -3,7 +3,7 @@
   <ownedViewpoints name="Ticket 1666" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Validation" initialisation="true" domainClass="EPackage">
       <defaultLayer name="Default">
-        <containerMappings name="V_EClass" semanticCandidatesExpression="feature:eContents" documentation="&lt;%eContents.filter(&quot;EClass&quot;)[.~.filter(&quot;EReference&quot;).nMinimize().nSize() > 0]%>" domainClass="EClass">
+        <containerMappings name="V_EClass" semanticCandidatesExpression="feature:eContents" documentation="aql:self.eContents()->filter(ecore::EClass)->select(e | e.eInverse(ecore::EReference)->asSet()->size() > 0)" domainClass="EClass">
           <subNodeMappings name="V_Reference" semanticCandidatesExpression="aql:self.eAllReferences.eReferenceType" domainClass="EClass">
             <style xsi:type="style:SquareDescription">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/sequence/vp-1546/interactionVP1546.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/sequence/vp-1546/interactionVP1546.odesign
index f20a642348..60f8df73ee 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/sequence/vp-1546/interactionVP1546.odesign
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/sequence/vp-1546/interactionVP1546.odesign
@@ -99,7 +99,7 @@
         </containerMappings>
         <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:self" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants">
           <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.getFinishingEnd()">
-            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[&lt;%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/>
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:'[' + self.name + ']'" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/>
           </subContainerMappings>
           <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']">
             <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/>