From c6c961d16efbdd6021c4e260e77ca58352d0294b Mon Sep 17 00:00:00 2001
From: Nicolas Vannier <nicolas.vannier@obeo.fr>
Date: Fri, 15 Nov 2024 13:19:28 +0100
Subject: [PATCH 1/2] Fixes mostly on handling sub-processes

- Boundary events not visible when created on sub-processes
- Sequence flow creation condition for sub-processes
- Sequence and message flows reconnection conditions for sub-processes
elements
- Fixed sequence flow condition tool precondition
- Removed unapplicable Set on Text annotation creation tool

Change-Id: I9bc66a4afe3b43a2453a6fab6493ab300c543f67
---
 .../description/BPMN2.odesign                 | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/plugins/org.obeonetwork.dsl.bpmn2.design/description/BPMN2.odesign b/plugins/org.obeonetwork.dsl.bpmn2.design/description/BPMN2.odesign
index 1350ecee..1ee79c03 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2.design/description/BPMN2.odesign
+++ b/plugins/org.obeonetwork.dsl.bpmn2.design/description/BPMN2.odesign
@@ -1918,7 +1918,7 @@
                 <labelFormat>bold</labelFormat>
               </style>
             </subContainerMappings>
-            <subContainerMappings name="SubProcess" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" deletionDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DeleteSubProcess']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('SubProcess')" doubleClickDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='SubProcessToggleCollapse_DoubleClick']" domainClass="bpmn2.SubProcess" dropDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='MoveFlowElementFromLaneToSubProcess']" reusedNodeMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='StartEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ComplexGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='EndEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='EventBasedGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ExclusiveGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='InclusiveGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='IntermediateCatchEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='IntermediateThrowEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ParallelGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ExternalLabel'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataInput'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataObject%20'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataOutput'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataStore'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='TextAnnotation'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Process']/@borderedNodeMappings[name='TaskBorderOnCallActivity_Process'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Task']/@borderedNodeMappings[name='TaskBorderOnCallActivity_Task'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='SubProcess']/@borderedNodeMappings[name='TaskBorderOnSubProcess'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='Task']/@borderedNodeMappings[name='TaskBorder']" reusedContainerMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='Task'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='SubProcess'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Process'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Task']">
+            <subContainerMappings name="SubProcess" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" deletionDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DeleteSubProcess']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('SubProcess')" doubleClickDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='SubProcessToggleCollapse_DoubleClick']" domainClass="bpmn2.SubProcess" dropDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='MoveFlowElementFromLaneToSubProcess']" reusedNodeMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='StartEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ComplexGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='EndEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='EventBasedGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ExclusiveGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='InclusiveGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='IntermediateCatchEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='IntermediateThrowEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ParallelGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ExternalLabel'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataInput'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataObject%20'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataOutput'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataStore'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='TextAnnotation']" reusedContainerMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='Task'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='SubProcess'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Process'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Task']">
               <borderedNodeMappings name="TaskBorderOnSubProcess" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.boundaryEventRefs" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.BoundaryEvent">
                 <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/sub-process-boundary-events/none.svg">
                   <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -2627,7 +2627,7 @@
       <additionalLayers name="Process" activeByDefault="true">
         <toolSections name="Connectors" label="%Connectors" icon="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/SequenceFlow.png">
           <ownedTools xsi:type="tool_1:ToolGroup" name="Sequence" label="%Sequence">
-            <tools xsi:type="tool_1:EdgeCreationDescription" name="SequenceFlowCreationTool" label="%Sequence" precondition="aql:preSource.eInverse('flowNodeRefs').eContainer() = preTarget.eInverse('flowNodeRefs').eContainer()" edgeMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@edgeMappings[name='SequenceFlow']" iconPath="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/SequenceFlow.png">
+            <tools xsi:type="tool_1:EdgeCreationDescription" name="SequenceFlowCreationTool" label="%Sequence" precondition="aql:(preSource.eContainer().oclIsKindOf(bpmn2::SubProcess) and preTarget.eContainer().oclIsKindOf(bpmn2::SubProcess) and preSource.eContainer()=preTarget.eContainer()) or (preSource.eInverse('flowNodeRefs')->size()>0 and preTarget.eInverse('flowNodeRefs')->size()>0 and preSource.eInverse('flowNodeRefs').eContainer() = preTarget.eInverse('flowNodeRefs').eContainer())" edgeMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@edgeMappings[name='SequenceFlow']" iconPath="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/SequenceFlow.png">
               <sourceVariable name="source"/>
               <targetVariable name="target"/>
               <sourceViewVariable name="sourceView"/>
@@ -2646,7 +2646,7 @@
                 </firstModelOperations>
               </initialOperation>
             </tools>
-            <tools xsi:type="tool:ToolDescription" name="Condition" label="%Condition" precondition="aql:element.oclIsKindOf(bpmn2::SequenceFlow) and element.oclAsType(bpmn2::SequenceFlow)==null" forceRefresh="true" iconPath="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/Expression.gif">
+            <tools xsi:type="tool:ToolDescription" name="Condition" label="%Condition" precondition="aql:element.oclIsKindOf(bpmn2::SequenceFlow) and element.oclAsType(bpmn2::SequenceFlow).conditionExpression=null" forceRefresh="true" iconPath="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/Expression.gif">
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
@@ -2703,7 +2703,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="ReconnectTargetSequenceFlow" precondition="aql:self.sourceRef.lanes->first().eContainer()=target.lanes->first().eContainer() or self.sourceRef.attachedToRef.lanes->first().eContainer()=target.lanes->first().eContainer()" forceRefresh="true">
+          <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="ReconnectTargetSequenceFlow" precondition="aql:(self.sourceRef.eContainer().oclIsKindOf(bpmn2::SubProcess) and target.eContainer().oclIsKindOf(bpmn2::SubProcess) and self.sourceRef.eContainer() = target.eContainer()) or self.sourceRef.lanes->first().eContainer()=target.lanes->first().eContainer() or self.sourceRef.attachedToRef.lanes->first().eContainer()=target.lanes->first().eContainer()" forceRefresh="true">
             <source name="source"/>
             <target name="target"/>
             <sourceView name="sourceView"/>
@@ -2716,7 +2716,7 @@
             </initialOperation>
             <edgeView name="edgeView"/>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="ReconnectSourceSequenceFlow" precondition="aql:self.sourceRef.lanes->first().eContainer()=target.lanes->first().eContainer() or self.sourceRef.attachedToRef.lanes->first().eContainer()=target.lanes->first().eContainer()" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE">
+          <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="ReconnectSourceSequenceFlow" precondition="aql:(self.sourceRef.eContainer().oclIsKindOf(bpmn2::SubProcess) and target.eContainer().oclIsKindOf(bpmn2::SubProcess) and self.sourceRef.eContainer() = target.eContainer()) or self.sourceRef.lanes->first().eContainer()=target.lanes->first().eContainer() or self.sourceRef.attachedToRef.lanes->first().eContainer()=target.lanes->first().eContainer()" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE">
             <source name="source"/>
             <target name="target"/>
             <sourceView name="sourceView"/>
@@ -2729,7 +2729,7 @@
             </initialOperation>
             <edgeView name="edgeView"/>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="ReconnectTargetMessageFlow" precondition="aql:self.sourceRef.lanes->first().eContainer()&lt;>target.lanes->first().eContainer()" forceRefresh="true">
+          <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="ReconnectTargetMessageFlow" precondition="aql:((self.sourceRef.eContainer().oclIsKindOf(bpmn2::SubProcess) or target.eContainer().oclIsKindOf(bpmn2::SubProcess)) and not(target.eContainer().oclIsKindOf(bpmn2::SubProcess) and self.sourceRef.eContainer() = target.eContainer())) or self.sourceRef.lanes->first().eContainer()&lt;>target.lanes->first().eContainer()" forceRefresh="true">
             <source name="source"/>
             <target name="target"/>
             <sourceView name="sourceView"/>
@@ -2742,7 +2742,7 @@
             </initialOperation>
             <edgeView name="edgeView"/>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="ReconnectSourceMessageFlow" precondition="aql:self.targetRef.lanes->first().eContainer()&lt;>target.lanes->first().eContainer()" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE">
+          <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="ReconnectSourceMessageFlow" precondition="aql:((self.targetRef.eContainer().oclIsKindOf(bpmn2::SubProcess) or target.eContainer().oclIsKindOf(bpmn2::SubProcess)) and not(target.eContainer().oclIsKindOf(bpmn2::SubProcess) and self.targetRef.eContainer() = target.eContainer())) or self.targetRef.lanes->first().eContainer()&lt;>target.lanes->first().eContainer()" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE">
             <source name="source"/>
             <target name="target"/>
             <sourceView name="sourceView"/>
@@ -2811,7 +2811,7 @@
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:element.createFlowElement('IntermediateThrowEvent')"/>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:NodeCreationDescription" name="BoundaryEventCreation" label="%Boundary" forceRefresh="true" nodeMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='Task']/@borderedNodeMappings[name='TaskBorder'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='SubProcess']/@borderedNodeMappings[name='TaskBorderOnSubProcess'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Process']/@borderedNodeMappings[name='TaskBorderOnCallActivity_Process'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Task']/@borderedNodeMappings[name='TaskBorderOnCallActivity_Task']" iconPath="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/BoundaryEvent.png">
+          <ownedTools xsi:type="tool_1:NodeCreationDescription" name="BoundaryEventCreation" label="%Boundary" forceRefresh="true" nodeMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='SubProcess']/@borderedNodeMappings[name='TaskBorderOnSubProcess'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='Task']/@borderedNodeMappings[name='TaskBorder'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Process']/@borderedNodeMappings[name='TaskBorderOnCallActivity_Process'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Task']/@borderedNodeMappings[name='TaskBorderOnCallActivity_Task']" iconPath="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/BoundaryEvent.png">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
@@ -3654,9 +3654,7 @@
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:container.eContainerOrSelf(bpmn2::Lane)">
                 <subModelOperations xsi:type="tool:CreateInstance" typeName="bpmn2.ExtensionAttributeValue" referenceName="extensionValues"/>
                 <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:instance">
-                  <subModelOperations xsi:type="tool:CreateInstance" typeName="bpmn2.TextAnnotation" referenceName="value">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="lanes" valueExpression="aql:container"/>
-                  </subModelOperations>
+                  <subModelOperations xsi:type="tool:CreateInstance" typeName="bpmn2.TextAnnotation" referenceName="value"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>

From 42bef631be05dba57d265d21278dd5e66d40aeec Mon Sep 17 00:00:00 2001
From: Nicolas Vannier <nicolas.vannier@obeo.fr>
Date: Mon, 18 Nov 2024 11:04:59 +0100
Subject: [PATCH 2/2] Fixes applied on process and sub-process diagrams

- Boundary events not visible when created on sub-processes
- Sequence flow creation condition for sub-processes
- Sequence and message flows reconnection conditions for sub-processes
elements
- Fixed sequence flow condition tool precondition
- Removed unapplicable Set on Text annotation creation tool
---
 .../description/BPMN2.odesign                 | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/plugins/org.obeonetwork.dsl.bpmn2.design/description/BPMN2.odesign b/plugins/org.obeonetwork.dsl.bpmn2.design/description/BPMN2.odesign
index 1ee79c03..d015b495 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2.design/description/BPMN2.odesign
+++ b/plugins/org.obeonetwork.dsl.bpmn2.design/description/BPMN2.odesign
@@ -172,7 +172,7 @@
                 <labelFormat>bold</labelFormat>
               </style>
             </subContainerMappings>
-            <subContainerMappings name="SubProcess" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" deletionDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DeleteSubProcess']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('SubProcess')" doubleClickDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='SubProcessToggleCollapse_DoubleClick']" domainClass="bpmn2.SubProcess" dropDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='MoveFlowElementFromLaneToSubProcess']" reusedNodeMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ComplexGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='EndEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='EventBasedGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ExclusiveGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ExternalLabel'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='InclusiveGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='IntermediateCatchEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='IntermediateThrowEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ParallelGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='StartEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subContainerMappings[name='SubProcess']/@borderedNodeMappings[name='TaskBorderOnSubProcess'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subContainerMappings[name='Task']/@borderedNodeMappings[name='TaskBorder'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Process']/@borderedNodeMappings[name='TaskBorderOnCallActivity_Process'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Task']/@borderedNodeMappings[name='TaskBorderOnCallActivity_Task'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataInput'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataObject%20'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataOutput'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataStore'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='TextAnnotation']" reusedContainerMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Process'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Task'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subContainerMappings[name='SubProcess'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subContainerMappings[name='Task']">
+            <subContainerMappings name="SubProcess" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" deletionDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DeleteSubProcess']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('SubProcess')" doubleClickDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='SubProcessToggleCollapse_DoubleClick']" domainClass="bpmn2.SubProcess" dropDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='MoveFlowElementFromLaneToSubProcess']" reusedNodeMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ComplexGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='EndEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='EventBasedGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ExclusiveGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ExternalLabel'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='InclusiveGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='IntermediateCatchEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='IntermediateThrowEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ParallelGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='StartEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataInput'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataObject%20'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataOutput'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataStore'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subNodeMappings[name='TextAnnotation']" reusedContainerMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Process'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Task'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subContainerMappings[name='SubProcess'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@containerMappings[name='HorizontalLaneSet']/@subContainerMappings[name='Lane']/@subContainerMappings[name='Task']">
               <borderedNodeMappings name="TaskBorderOnSubProcess" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.boundaryEventRefs" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.BoundaryEvent">
                 <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/sub-process-boundary-events/none.svg">
                   <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -508,7 +508,7 @@
         </toolSections>
         <toolSections name="Connectors" label="%Connectors" icon="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/SequenceFlow.png">
           <ownedTools xsi:type="tool_1:ToolGroup" name="Sequence" label="%Sequence">
-            <tools xsi:type="tool_1:EdgeCreationDescription" name="SequenceFlowCreationTool" label="%Sequence" precondition="aql:preSource.eInverse('flowNodeRefs').eContainer() = preTarget.eInverse('flowNodeRefs').eContainer()" forceRefresh="true" edgeMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@edgeMappings[name='SequenceFlow']" iconPath="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/SequenceFlow.png">
+            <tools xsi:type="tool_1:EdgeCreationDescription" name="SequenceFlowCreationTool" label="%Sequence" precondition="aql:(preSource.eContainer().oclIsKindOf(bpmn2::SubProcess) and preTarget.eContainer().oclIsKindOf(bpmn2::SubProcess) and preSource.eContainer()=preTarget.eContainer()) or (preSource.eInverse('flowNodeRefs')->size()>0 and preTarget.eInverse('flowNodeRefs')->size()>0 and preSource.eInverse('flowNodeRefs').eContainer() = preTarget.eInverse('flowNodeRefs').eContainer())" forceRefresh="true" edgeMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@edgeMappings[name='SequenceFlow']" iconPath="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/SequenceFlow.png">
               <sourceVariable name="source"/>
               <targetVariable name="target"/>
               <sourceViewVariable name="sourceView"/>
@@ -527,7 +527,7 @@
                 </firstModelOperations>
               </initialOperation>
             </tools>
-            <tools xsi:type="tool:ToolDescription" name="Condition" label="%Condition" precondition="aql:element.oclIsKindOf(bpmn2::SequenceFlow) and element.oclAsType(bpmn2::SequenceFlow)==null" forceRefresh="true" iconPath="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/Expression.gif">
+            <tools xsi:type="tool:ToolDescription" name="Condition" label="%Condition" precondition="aql:element.oclIsKindOf(bpmn2::SequenceFlow) and element.oclAsType(bpmn2::SequenceFlow).conditionExpression=null" forceRefresh="true" iconPath="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/Expression.gif">
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
@@ -584,7 +584,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="ReconnectTargetSequenceFlow" precondition="aql:self.sourceRef.lanes->first().eContainer()=target.lanes->first().eContainer() or self.sourceRef.attachedToRef.lanes->first().eContainer()=target.lanes->first().eContainer()" forceRefresh="true">
+          <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="ReconnectTargetSequenceFlow" precondition="aql:(self.sourceRef.eContainer().oclIsKindOf(bpmn2::SubProcess) and target.eContainer().oclIsKindOf(bpmn2::SubProcess) and self.sourceRef.eContainer() = target.eContainer()) or self.sourceRef.lanes->first().eContainer()=target.lanes->first().eContainer() or self.sourceRef.attachedToRef.lanes->first().eContainer()=target.lanes->first().eContainer()" forceRefresh="true">
             <source name="source"/>
             <target name="target"/>
             <sourceView name="sourceView"/>
@@ -597,7 +597,7 @@
             </initialOperation>
             <edgeView name="edgeView"/>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="ReconnectSourceSequenceFlow" precondition="aql:self.sourceRef.lanes->first().eContainer()=target.lanes->first().eContainer() or self.sourceRef.attachedToRef.lanes->first().eContainer()=target.lanes->first().eContainer()" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE">
+          <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="ReconnectSourceSequenceFlow" precondition="aql:(self.sourceRef.eContainer().oclIsKindOf(bpmn2::SubProcess) and target.eContainer().oclIsKindOf(bpmn2::SubProcess) and self.sourceRef.eContainer() = target.eContainer()) or self.sourceRef.lanes->first().eContainer()=target.lanes->first().eContainer() or self.sourceRef.attachedToRef.lanes->first().eContainer()=target.lanes->first().eContainer()" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE">
             <source name="source"/>
             <target name="target"/>
             <sourceView name="sourceView"/>
@@ -1478,9 +1478,7 @@
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:container.eContainerOrSelf(bpmn2::Lane)">
                 <subModelOperations xsi:type="tool:CreateInstance" typeName="bpmn2.ExtensionAttributeValue" referenceName="extensionValues"/>
                 <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:instance">
-                  <subModelOperations xsi:type="tool:CreateInstance" typeName="bpmn2.TextAnnotation" referenceName="value">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="lanes" valueExpression="aql:container"/>
-                  </subModelOperations>
+                  <subModelOperations xsi:type="tool:CreateInstance" typeName="bpmn2.TextAnnotation" referenceName="value"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -4149,7 +4147,7 @@
         </toolSections>
         <toolSections name="Connectors" label="%Connectors" icon="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/SequenceFlow.png">
           <ownedTools xsi:type="tool_1:ToolGroup" name="Sequence" label="%Sequence">
-            <tools xsi:type="tool_1:EdgeCreationDescription" name="SequenceFlowCreationTool" label="%Sequence" precondition="aql:preSource.eInverse('flowNodeRefs').eContainer() = preTarget.eInverse('flowNodeRefs').eContainer()" forceRefresh="true" edgeMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='SubProcessDiagram']/@defaultLayer/@edgeMappings[name='SequenceFlow']" iconPath="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/SequenceFlow.png">
+            <tools xsi:type="tool_1:EdgeCreationDescription" name="SequenceFlowCreationTool" label="%Sequence" precondition="aql:(preSource.eContainer().oclIsKindOf(bpmn2::SubProcess) and preTarget.eContainer().oclIsKindOf(bpmn2::SubProcess) and preSource.eContainer()=preTarget.eContainer()) or (preSource.eInverse('flowNodeRefs')->size()>0 and preTarget.eInverse('flowNodeRefs')->size()>0 and preSource.eInverse('flowNodeRefs').eContainer() = preTarget.eInverse('flowNodeRefs').eContainer())" forceRefresh="true" edgeMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='SubProcessDiagram']/@defaultLayer/@edgeMappings[name='SequenceFlow']" iconPath="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/SequenceFlow.png">
               <sourceVariable name="source"/>
               <targetVariable name="target"/>
               <sourceViewVariable name="sourceView"/>
@@ -4168,7 +4166,7 @@
                 </firstModelOperations>
               </initialOperation>
             </tools>
-            <tools xsi:type="tool:ToolDescription" name="Condition" label="%Condition" precondition="aql:element.oclIsKindOf(bpmn2::SequenceFlow) and element.oclAsType(bpmn2::SequenceFlow)==null" forceRefresh="true" iconPath="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/Expression.gif">
+            <tools xsi:type="tool:ToolDescription" name="Condition" label="%Condition" precondition="aql:element.oclIsKindOf(bpmn2::SequenceFlow) and element.oclAsType(bpmn2::SequenceFlow).conditionExpression=null" forceRefresh="true" iconPath="/org.obeonetwork.dsl.bpmn2.edit/icons/full/obj16/Expression.gif">
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
@@ -4225,7 +4223,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="ReconnectTargetSequenceFlow" precondition="aql:self.sourceRef.lanes->first().eContainer()=target.lanes->first().eContainer() or self.sourceRef.attachedToRef.lanes->first().eContainer()=target.lanes->first().eContainer()" forceRefresh="true">
+          <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="ReconnectTargetSequenceFlow" precondition="aql:(self.sourceRef.eContainer().oclIsKindOf(bpmn2::SubProcess) and target.eContainer().oclIsKindOf(bpmn2::SubProcess) and self.sourceRef.eContainer() = target.eContainer()) or self.sourceRef.lanes->first().eContainer()=target.lanes->first().eContainer() or self.sourceRef.attachedToRef.lanes->first().eContainer()=target.lanes->first().eContainer()" forceRefresh="true">
             <source name="source"/>
             <target name="target"/>
             <sourceView name="sourceView"/>
@@ -4238,7 +4236,7 @@
             </initialOperation>
             <edgeView name="edgeView"/>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="ReconnectSourceSequenceFlow" precondition="aql:self.sourceRef.lanes->first().eContainer()=target.lanes->first().eContainer() or self.sourceRef.attachedToRef.lanes->first().eContainer()=target.lanes->first().eContainer()" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE">
+          <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="ReconnectSourceSequenceFlow" precondition="aql:(self.sourceRef.eContainer().oclIsKindOf(bpmn2::SubProcess) and target.eContainer().oclIsKindOf(bpmn2::SubProcess) and self.sourceRef.eContainer() = target.eContainer()) or self.sourceRef.lanes->first().eContainer()=target.lanes->first().eContainer() or self.sourceRef.attachedToRef.lanes->first().eContainer()=target.lanes->first().eContainer()" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE">
             <source name="source"/>
             <target name="target"/>
             <sourceView name="sourceView"/>
@@ -5078,9 +5076,7 @@
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:container.eContainerOrSelf(bpmn2::SubProcess)">
                 <subModelOperations xsi:type="tool:CreateInstance" typeName="bpmn2.ExtensionAttributeValue" referenceName="extensionValues"/>
                 <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:instance">
-                  <subModelOperations xsi:type="tool:CreateInstance" typeName="bpmn2.TextAnnotation" referenceName="value">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="lanes" valueExpression="aql:container"/>
-                  </subModelOperations>
+                  <subModelOperations xsi:type="tool:CreateInstance" typeName="bpmn2.TextAnnotation" referenceName="value"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>