fixed

Issue imixs#182
NourEldin-Ali · Feb 17, 2023 · 5328a3f · 5328a3f
1 parent d8f8d6a
commit 5328a3f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/operations/BPMNDeleteNodeHandler.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/operations/BPMNDeleteNodeHandler.java
@@ -51,9 +51,7 @@ public void executeOperation(final DeleteOperation operation) {
             System.out.println("Elements to delete are not specified");
         }
         for (String id : elementIds) {
-            // Update the source model
-            System.out.println("...delete Element " + id);
-            // test if the element is a participant or a FlowElement
+            // test if the element is a participant
             Participant participant = modelState.getBpmnModel().findParticipantById(id);
             if (participant != null) {
                 // delete participant with the pool and all contained elements

diff --git a/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/elements/BPMNProcess.java b/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/elements/BPMNProcess.java
@@ -755,30 +755,31 @@ public void deleteLane(String id) {
      * @param id
      */
     public void deleteElementNode(String id) {
-        BPMNElementNode bpmnElement = findElementNodeById(id);
-        if (bpmnElement == null) {
-            // does not exist
-            logger.warning("Element '" + id + "' does not exists in current process!");
-            return;
-        }
 
-        // test if the element is a lane
+        // First test if the element is a lane
         Lane lane = this.findLaneById(id);
         if (lane != null) {
             this.deleteLane(id);
             return;
         }
 
-        // remove all flows
+        BPMNElementNode bpmnElement = findElementNodeById(id);
+        if (bpmnElement == null) {
+            // does not exist
+            logger.warning("Element '" + id + "' does not exists in current process!");
+            return;
+        }
+
+        // remove all flows...
         removeAllEdgesFromElement(bpmnElement.getId());
 
-        // delete the shape
+        // delete the shape....
         this.getElementNode().removeChild(bpmnElement.getElementNode());
         if (bpmnElement.getBpmnShape() != null) {
             model.getBpmnPlane().removeChild(bpmnElement.getBpmnShape());
         }
 
-        // finally delete the element from the corresponding list
+        // ...and finally delete the element from the corresponding element list
         if (bpmnElement instanceof Activity) {
             this.getActivities().remove(bpmnElement);
         }