fixed updatePropertyPanel method

Issue #291
imixs · Sep 14, 2023 · 937c6ce · 937c6ce
1 parent e8c7a72
commit 937c6ce
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 46 deletions.
diff --git a/open-bpmn.glsp-client/open-bpmn-model/src/model.ts b/open-bpmn.glsp-client/open-bpmn-model/src/model.ts
@@ -286,17 +286,22 @@ export function isBPMNLabelNode(element: SModelElement): element is SModelElemen
 }
 
 /*
-* This method returns the BPMN Node Element of a given SModelElement.
-* The method detects if the given ModelElement is for example a SPort
-* or label:heading. In this case the method returns the parent element
-* which is a Task, Event or Gateway node
+* This method returns true if the element is a BPMN Node Element.
 */
-export function isBPMNNode(element: SModelElement): element is TaskNode | EventNode | GatewayNode {
+export function isBPMNNode(element: SModelElement): element is TaskNode | EventNode | GatewayNode |
+ DataObjectNode | TextAnnotationNode | MessageNode | PoolNode {
     return element instanceof TaskNode || element instanceof EventNode || element instanceof GatewayNode ||
            element instanceof DataObjectNode || element instanceof TextAnnotationNode ||
 		element instanceof MessageNode || element instanceof PoolNode;
 }
 
+/*
+* This method returns true if the element is a BPMN Edge Element.
+*/
+export function isBPMNEdge(element: SModelElement): element is BPMNEdge {
+    return element instanceof BPMNEdge;
+}
+
 /*
  * Returns true if the BPMN Node Element is a BoundaryEvent
  */
@@ -307,6 +312,6 @@ export function isBoundaryEvent(element: SModelElement): element is EventNode {
 /*
  * Returns true if the model Element is a LaneDivider
  */
-export function isLaneDivider(element: SModelElement): element is EventNode {
+export function isLaneDivider(element: SModelElement): boolean {
     return element.type === 'lane-divider';
 }
diff --git a/open-bpmn.glsp-client/open-bpmn-properties/src/bpmn-property-panel.tsx b/open-bpmn.glsp-client/open-bpmn-properties/src/bpmn-property-panel.tsx
@@ -35,7 +35,7 @@ import {
 import { SelectionListener, SelectionService } from '@eclipse-glsp/client/lib/features/select/selection-service';
 import { JsonForms } from '@jsonforms/react';
 import { vanillaCells, vanillaRenderers } from '@jsonforms/vanilla-renderers';
-import { isBPMNNode, isBoundaryEvent } from '@open-bpmn/open-bpmn-model';
+import { isBPMNEdge, isBPMNNode, isBoundaryEvent } from '@open-bpmn/open-bpmn-model';
 import { inject, injectable, postConstruct } from 'inversify';
 import * as React from 'react';
 import { createRoot } from 'react-dom/client';
@@ -312,7 +312,7 @@ export class BPMNPropertyPanel extends AbstractUIExtension implements SelectionL
             return;
         }
 
-        // now if we have an element we show teh panel..
+        // now if we have an element we show the panel..
         if (_id) {
             // did we have a change?
             // set new selectionId
@@ -360,7 +360,7 @@ export class BPMNPropertyPanel extends AbstractUIExtension implements SelectionL
             // load element from index
             element=this.modelRoot.index.getById(_elementID);
              // skip undefined elements or laneDivider
-            if (!element || !isBPMNNode(element)) {
+            if (!element || (!isBPMNNode(element) && !isBPMNEdge(element))) {
                 element=this.modelRoot;
                 this.headerTitle.textContent = 'Default Process';
             } else {

diff --git a/open-bpmn.glsp-client/workspace/demo.bpmn b/open-bpmn.glsp-client/workspace/demo.bpmn
@@ -6,25 +6,25 @@
       <bpmn2:outgoing>SequenceFlow_DluZ0w</bpmn2:outgoing>
       <bpmn2:documentation id="documentation_ncXFfA"/>
     </bpmn2:startEvent>
-    <bpmn2:endEvent id="event-Lf0tC291FgQtlKAA" name="Event-1">
+    <bpmn2:endEvent id="event-Lf0tC291FgQtlKAA" name="End">
       <bpmn2:incoming>SequenceFlow_WQB6iw</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_V3txEw</bpmn2:incoming>
       <bpmn2:compensationEventDefinition id="compensationEventDefinition_PRwc0A"/>
       <bpmn2:documentation id="documentation_NZFrCw"/>
     </bpmn2:endEvent>
-    <bpmn2:manualTask id="task-o6w2XYdMAEFdPoz6" name="Task-03">
+    <bpmn2:manualTask id="task-o6w2XYdMAEFdPoz6" name="Task 1">
       <bpmn2:incoming>SequenceFlow_DluZ0w</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_VcdThQ</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_7QjkDg</bpmn2:outgoing>
       <bpmn2:documentation id="documentation_59KxPQ"/>
     </bpmn2:manualTask>
-    <bpmn2:intermediateThrowEvent id="event-RWwHnNS7eov3rwZt" name="Event-3">
+    <bpmn2:intermediateThrowEvent id="event-RWwHnNS7eov3rwZt" name="Event 1">
       <bpmn2:linkEventDefinition id="linkEventDefinition_gcDiNg" name="test" target=""/>
       <bpmn2:incoming>SequenceFlow_7QjkDg</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_dO4f_w</bpmn2:outgoing>
       <bpmn2:documentation id="documentation_JbzQqg"/>
     </bpmn2:intermediateThrowEvent>
-    <bpmn2:exclusiveGateway default="SequenceFlow_aWXnhw" gatewayDirection="Diverging" id="gateway-x-5pgIVJdmbuowHl" name="Gateway-1">
+    <bpmn2:exclusiveGateway default="SequenceFlow_aWXnhw" gatewayDirection="Diverging" id="gateway-x-5pgIVJdmbuowHl" name="Gateway 1">
       <bpmn2:incoming>SequenceFlow_VcdThQ</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_aWXnhw</bpmn2:outgoing>
       <bpmn2:documentation id="documentation_l7b0EQ"/>
@@ -33,23 +33,23 @@
     <bpmn2:sequenceFlow id="SequenceFlow_DluZ0w" sourceRef="event-qsTs3pwtoD_KuarJ" targetRef="task-o6w2XYdMAEFdPoz6">
       <bpmn2:documentation id="documentation_PgB30g"/>
     </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_VcdThQ" name="&lt; 100" sourceRef="task-o6w2XYdMAEFdPoz6" targetRef="gateway-x-5pgIVJdmbuowHl">
+    <bpmn2:sequenceFlow id="SequenceFlow_VcdThQ" name="Condition" sourceRef="task-o6w2XYdMAEFdPoz6" targetRef="gateway-x-5pgIVJdmbuowHl">
       <bpmn2:documentation id="documentation_fgmcUA"/>
     </bpmn2:sequenceFlow>
-    <bpmn2:scriptTask id="task-OhxXDbiZnXmPN4mn" name="Task-1" scriptFormat="">
+    <bpmn2:scriptTask id="task-OhxXDbiZnXmPN4mn" name="Task 3" scriptFormat="">
       <bpmn2:incoming>SequenceFlow_aWXnhw</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_WQB6iw</bpmn2:outgoing>
       <bpmn2:incoming>SequenceFlow_mPvQTA</bpmn2:incoming>
       <bpmn2:documentation id="documentation_vYBL6g"><![CDATA[abc]]></bpmn2:documentation>
       <bpmn2:script id="script_RnHibw"><![CDATA[123]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_aWXnhw" name="Default" sourceRef="gateway-x-5pgIVJdmbuowHl" targetRef="task-OhxXDbiZnXmPN4mn">
+    <bpmn2:sequenceFlow id="SequenceFlow_aWXnhw" name="Default " sourceRef="gateway-x-5pgIVJdmbuowHl" targetRef="task-OhxXDbiZnXmPN4mn">
       <bpmn2:documentation id="documentation_s70fnQ"/>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_WQB6iw" sourceRef="task-OhxXDbiZnXmPN4mn" targetRef="event-Lf0tC291FgQtlKAA">
       <bpmn2:documentation id="documentation_udPnRQ"/>
     </bpmn2:sequenceFlow>
-    <bpmn2:userTask id="task-y6CwOlM3ErBatGcC" name="Task-2">
+    <bpmn2:userTask id="task-y6CwOlM3ErBatGcC" name="Task 2">
       <bpmn2:incoming>SequenceFlow_dO4f_w</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_V3txEw</bpmn2:outgoing>
       <bpmn2:documentation id="documentation_D8g6uw"/>
@@ -63,7 +63,7 @@
     <bpmn2:sequenceFlow id="SequenceFlow_V3txEw" sourceRef="task-y6CwOlM3ErBatGcC" targetRef="event-Lf0tC291FgQtlKAA">
       <bpmn2:documentation id="documentation_FbrSTQ"/>
     </bpmn2:sequenceFlow>
-    <bpmn2:endEvent id="event-uknzqassL4vCovYu" name="Event-3">
+    <bpmn2:endEvent id="event-uknzqassL4vCovYu" name="End -&gt; send Message">
       <bpmn2:documentation id="documentation_vyDB5A"/>
       <bpmn2:incoming>sequenceFlow_Fj9HIg</bpmn2:incoming>
       <bpmn2:messageEventDefinition id="messageEventDefinition_2C1j0Q" messageRef="message_1"/>
@@ -74,17 +74,18 @@
       <bpmn2:incoming>sequenceFlow_JJja1Q</bpmn2:incoming>
       <bpmn2:outgoing>sequenceFlow_Fj9HIg</bpmn2:outgoing>
     </bpmn2:manualTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_mPvQTA" sourceRef="task-QPIGCYMfw_QDb6gr" targetRef="task-OhxXDbiZnXmPN4mn">
+    <bpmn2:sequenceFlow id="SequenceFlow_mPvQTA" name="" sourceRef="task-QPIGCYMfw_QDb6gr" targetRef="task-OhxXDbiZnXmPN4mn">
       <bpmn2:documentation id="documentation_aKXPXQ"/>
     </bpmn2:sequenceFlow>
     <bpmn2:documentation id="documentation_0r04oA"/>
-    <bpmn2:intermediateCatchEvent id="event_017eUg" name="Event-5">
+    <bpmn2:intermediateCatchEvent id="event_017eUg" name="Event 2">
       <bpmn2:documentation id="documentation_0aHmxg"/>
       <bpmn2:incoming>sequenceFlow_C400hw</bpmn2:incoming>
       <bpmn2:outgoing>sequenceFlow_JJja1Q</bpmn2:outgoing>
     </bpmn2:intermediateCatchEvent>
-    <bpmn2:sequenceFlow id="sequenceFlow_C400hw" sourceRef="gateway-x-5pgIVJdmbuowHl" targetRef="event_017eUg">
+    <bpmn2:sequenceFlow id="sequenceFlow_C400hw" name="&gt;100" sourceRef="gateway-x-5pgIVJdmbuowHl" targetRef="event_017eUg">
       <bpmn2:documentation id="documentation_tG574Q"/>
+      <bpmn2:conditionExpression id="formalExpression_18D0og" xsi:type="bpmn2:tFormalExpression"><![CDATA[a>=100]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="sequenceFlow_JJja1Q" sourceRef="event_017eUg" targetRef="task-QPIGCYMfw_QDb6gr">
       <bpmn2:documentation id="documentation_jhtM0g"/>
@@ -99,6 +100,12 @@
     <bpmn2:association id="association_2unAVg" sourceRef="textAnnotation_tzJRtA" targetRef="event-qsTs3pwtoD_KuarJ">
       <bpmn2:documentation id="documentation_Y2uyBA"/>
     </bpmn2:association>
+    <bpmn2:dataObject id="dataObject_DrGkHA" name="Data Object-1">
+      <bpmn2:documentation id="documentation_DhC1fQ"/>
+    </bpmn2:dataObject>
+    <bpmn2:association id="association_olYbcA" sourceRef="dataObject_DrGkHA" targetRef="task-y6CwOlM3ErBatGcC">
+      <bpmn2:documentation id="documentation_bhwPSQ"/>
+    </bpmn2:association>
   </bpmn2:process>
   <bpmn2:message id="message_1" name="Message 1">
     <bpmn2:documentation id="documentation_GQJQkA"/>
@@ -112,9 +119,9 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="event-Lf0tC291FgQtlKAA" id="BPMNShape_fVG2vg">
-        <dc:Bounds height="36.0" width="36.0" x="640.0" y="72.0"/>
+        <dc:Bounds height="36.0" width="36.0" x="670.0" y="140.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_FVC5xQ">
-          <dc:Bounds height="20.0" width="100.0" x="604.765625" y="53.0"/>
+          <dc:Bounds height="20.0" width="100.0" x="710.0" y="145.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="task-o6w2XYdMAEFdPoz6" id="BPMNShape_AoYLLA">
@@ -149,9 +156,8 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="SequenceFlow_WQB6iw" id="BPMNEdge_Qw1KFw">
         <di:waypoint x="531.0" y="234.0"/>
-        <di:waypoint x="735.0" y="234.0"/>
-        <di:waypoint x="735.0" y="90.0"/>
-        <di:waypoint x="676.0" y="90.0"/>
+        <di:waypoint x="690.0" y="234.0"/>
+        <di:waypoint x="690.0" y="175.88854381999832"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape bpmnElement="task-y6CwOlM3ErBatGcC" id="BPMNShape_YtngBQ">
         <dc:Bounds height="50.0" width="110.0" x="490.0" y="65.0"/>
@@ -166,7 +172,8 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="SequenceFlow_V3txEw" id="BPMNEdge_Hk4_zw">
         <di:waypoint x="600.0" y="90.0"/>
-        <di:waypoint x="640.0" y="90.0"/>
+        <di:waypoint x="690.0" y="90.0"/>
+        <di:waypoint x="690.0" y="140.11145618000168"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape bpmnElement="event-uknzqassL4vCovYu" id="BPMNShape_KM-0yw">
         <dc:Bounds height="36.0" width="36.0" x="622.0" y="335.0"/>
@@ -206,14 +213,24 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="textAnnotation_tzJRtA" id="BPMNShape_x3lruw">
-        <dc:Bounds height="55.0" width="132.0" x="76.388671875" y="183.69837951660156"/>
+        <dc:Bounds height="50.0" width="152.0" x="10.0" y="180.0"/>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="association_2unAVg" id="BPMNEdge_8nm2Wg" sourceElement="BPMNShape_x3lruw" targetElement="BPMNShape_uy8uYw">
-        <di:waypoint x="142.388671875" y="183.69837951660156"/>
-        <di:waypoint x="142.388671875" y="145.84918212890625"/>
-        <di:waypoint x="109.0" y="145.84918212890625"/>
+        <di:waypoint x="76.0" y="180.0"/>
+        <di:waypoint x="76.0" y="144.0"/>
+        <di:waypoint x="109.0" y="144.0"/>
         <di:waypoint x="109.0" y="108.0"/>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape bpmnElement="dataObject_DrGkHA" id="BPMNShape_iIUygA">
+        <dc:Bounds height="50.0" width="35.0" x="527.5" y="-20.0"/>
+        <bpmndi:BPMNLabel id="BPMNLabel_py1byQ">
+          <dc:Bounds height="20.0" width="100.0" x="495.0" y="35.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="association_olYbcA" id="BPMNEdge_hf6UAg" sourceElement="BPMNShape_iIUygA" targetElement="BPMNShape_YtngBQ">
+        <di:waypoint x="545.0" y="30.0"/>
+        <di:waypoint x="545.0" y="65.0"/>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
diff --git a/open-bpmn.glsp-client/workspace/test/collaboration-03.bpmn b/open-bpmn.glsp-client/workspace/test/collaboration-03.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- origin at X=0.0 Y=0.0 --><bpmn2:definitions xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" exporter="org.eclipse.bpmn2.modeler.core" exporterVersion="1.5.4.RC1-v20220528-0836-B1" id="Definitions_1">
+<!-- origin at X=0.0 Y=0.0 --><bpmn2:definitions xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:open-bpmn="http://open-bpmn.org/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" exporter="org.eclipse.bpmn2.modeler.core" exporterVersion="1.5.4.RC1-v20220528-0836-B1" id="Definitions_1">
   <bpmn2:collaboration id="Collaboration_1" name="Collaboration 1">
     <bpmn2:participant id="Participant_1" name="Pool 1" processRef="Process_1">
       <bpmn2:documentation id="documentation_fVVAkQ"/>
@@ -20,7 +20,7 @@
       <bpmn2:documentation id="documentation_nzqAxg"/>
     </bpmn2:messageFlow>
   </bpmn2:collaboration>
-  <bpmn2:process definitionalCollaborationRef="Collaboration_1" id="Process_1" isExecutable="false" name="Pool 1 Process">
+  <bpmn2:process definitionalCollaborationRef="Collaboration_1" id="Process_1" isExecutable="false" name="Pool 1">
     <bpmn2:laneSet id="LaneSet_1" name="Lane Set 1">
       <bpmn2:lane id="Lane_1" name="Lane 1">
         <bpmn2:flowNodeRef>UserTask_1</bpmn2:flowNodeRef>
@@ -115,7 +115,7 @@
         <dc:Bounds height="147.0" width="586.0" x="79.0" y="271.0"/>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="UserTask_1" id="BPMNShape_UserTask_1" isExpanded="true">
-        <dc:Bounds height="50.0" width="110.0" x="183.0" y="66.0"/>
+        <dc:Bounds height="50.0" width="110.0" x="184.0" y="66.0"/>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="BusinessRuleTask_1" id="BPMNShape_BusinessRuleTask_1" isExpanded="true">
         <dc:Bounds height="50.0" width="110.0" x="196.0" y="306.0"/>
@@ -126,13 +126,13 @@
       <bpmndi:BPMNShape bpmnElement="event_6HffFg" id="BPMNShape_ivfKEg">
         <dc:Bounds height="36.0" width="36.0" x="587.0" y="313.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_UHZabQ" labelStyle="BPMNLabelStyle_1">
-          <dc:Bounds height="16.0" width="100.0" x="555.0" y="352.0"/>
+          <dc:Bounds height="20.0" width="100.0" x="555.0" y="352.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_1" id="BPMNShape_IntermediateCatchEvent_1">
         <dc:Bounds height="36.0" width="36.0" x="393.0" y="313.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_11" labelStyle="BPMNLabelStyle_1">
-          <dc:Bounds height="28.0" width="79.0" x="372.0" y="349.0"/>
+          <dc:Bounds height="20.0" width="100.0" x="361.5" y="349.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="MessageFlow_70UPUw" id="BPMNEdge_QvjZKw" sourceElement="BPMNShape_Participant_2" targetElement="BPMNShape_Participant_1">
@@ -154,9 +154,9 @@
       <bpmndi:BPMNEdge bpmnElement="messageFlow_hRBSTA" id="BPMNEdge_leqgag" sourceElement="BPMNShape_dphdwg" targetElement="BPMNShape_ivfKEg">
         <bpmndi:BPMNLabel id="BPMNLabel_10"/>
         <di:waypoint x="496.0" y="116.0"/>
-        <di:waypoint x="496.0" y="145.47162244828564"/>
-        <di:waypoint x="601.765400118215" y="145.47162244828564"/>
-        <di:waypoint x="601.765400118215" y="313.2930137063148"/>
+        <di:waypoint x="496.0" y="145.47161865234375"/>
+        <di:waypoint x="601.765380859375" y="145.47161865234375"/>
+        <di:waypoint x="601.765380859375" y="313.29301722440823"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="SequenceFlow_1" id="BPMNEdge_SequenceFlow_1" sourceElement="BPMNShape_BusinessRuleTask_1" targetElement="BPMNShape_IntermediateCatchEvent_1">
         <bpmndi:BPMNLabel id="BPMNLabel_12"/>
@@ -172,27 +172,27 @@
         <bpmndi:BPMNLabel id="BPMNLabel_14"/>
         <di:waypoint x="411.0" y="313.0"/>
         <di:waypoint x="411.0" y="248.5"/>
-        <di:waypoint x="397.272099393567" y="248.5"/>
-        <di:waypoint x="397.272099393567" y="184.0"/>
+        <di:waypoint x="397.2720947265625" y="248.5"/>
+        <di:waypoint x="397.2720947265625" y="184.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape bpmnElement="event_hzPagg" id="BPMNShape_KgH5jw">
         <dc:Bounds height="36.0" width="36.0" x="118.92451477050781" y="73.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_PLk1yA">
-          <dc:Bounds height="16.0" width="100.0" x="86.92452239990234" y="112.0"/>
+          <dc:Bounds height="20.0" width="100.0" x="86.92452239990234" y="112.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="event_iuZTJg" id="BPMNShape_MLNYFg">
         <dc:Bounds height="36.0" width="36.0" x="593.9244995117188" y="73.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_v8Fl5Q">
-          <dc:Bounds height="16.0" width="100.0" x="561.9244995117188" y="111.99999618530273"/>
+          <dc:Bounds height="20.0" width="100.0" x="561.9244995117188" y="111.99999237060547"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sequenceFlow_y0vkDw" id="BPMNEdge_grWYVQ" sourceElement="BPMNShape_KgH5jw" targetElement="BPMNShape_UserTask_1">
         <di:waypoint x="154.9245147705078" y="91.0"/>
-        <di:waypoint x="183.0" y="91.0"/>
+        <di:waypoint x="184.0" y="91.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sequenceFlow_NX0ztw" id="BPMNEdge_V7pXGg" sourceElement="BPMNShape_UserTask_1" targetElement="BPMNShape_dphdwg">
-        <di:waypoint x="293.0" y="91.0"/>
+        <di:waypoint x="294.0" y="91.0"/>
         <di:waypoint x="441.0" y="91.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sequenceFlow_mez3zA" id="BPMNEdge_atsBTA" sourceElement="BPMNShape_dphdwg" targetElement="BPMNShape_MLNYFg">
@@ -202,7 +202,7 @@
       <bpmndi:BPMNShape bpmnElement="event_BpbDAQ" id="BPMNShape_k00a2w">
         <dc:Bounds height="36.0" width="36.0" x="120.6390380859375" y="313.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_4rJTAw">
-          <dc:Bounds height="16.0" width="100.0" x="88.6390380859375" y="352.0"/>
+          <dc:Bounds height="20.0" width="100.0" x="88.6390380859375" y="352.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sequenceFlow_76rvyg" id="BPMNEdge_9Myp7w" sourceElement="BPMNShape_k00a2w" targetElement="BPMNShape_BusinessRuleTask_1">