refinement of live validation in the ReconnectEdgeOperation

Issue #346
imixs · Jun 17, 2024 · 7bbafce · 7bbafce
1 parent f1d96f3
commit 7bbafce
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/...-server/src/main/java/org/openbpmn/glsp/operations/BPMNReconnectEdgeOperationHandler.java b/...-server/src/main/java/org/openbpmn/glsp/operations/BPMNReconnectEdgeOperationHandler.java
@@ -49,6 +49,11 @@ public Optional<Command> createCommand(ReconnectEdgeOperation operation) {
         return commandOf(() -> executeOperation(operation));
     }
 
+    /**
+     * This helper method re-validates the affected elements
+     * 
+     * @param operation
+     */
     private void executeOperation(final ReconnectEdgeOperation operation) {
 
         String edgeID = operation.getEdgeElementId();
@@ -59,6 +64,16 @@ private void executeOperation(final ReconnectEdgeOperation operation) {
 
         BPMNElementEdge bpmnElementEdge = modelState.getBpmnModel().findElementEdgeById(edgeID);
 
+        // We need to identify the old element that lost its connection....
+        String oldSourceElementID = bpmnElementEdge.getSourceRef();
+        String oldTargetElementID = bpmnElementEdge.getTargetRef();
+        BPMNElementNode oldElement = null;
+        if (sourceElementID.equals(oldSourceElementID)) {
+            oldElement = modelState.getBpmnModel().findElementNodeById(oldTargetElementID);
+        } else {
+            oldElement = modelState.getBpmnModel().findElementNodeById(oldSourceElementID);
+        }
+
         BPMNElementNode targetElement = modelState.getBpmnModel().findElementNodeById(targetElementID);
         BPMNElementNode sourceElement = modelState.getBpmnModel().findElementNodeById(sourceElementID);
 
@@ -82,6 +97,10 @@ private void executeOperation(final ReconnectEdgeOperation operation) {
             bpmnElementEdge.setSourceRef(sourceElementID);
             bpmnElementEdge.setTargetRef(targetElementID);
 
+            // invalidate old oldElement
+            if (oldElement != null) {
+                oldElement.resetValidation();
+            }
             // invalidate source/target
             sourceElement.resetValidation();
             targetElement.resetValidation();