minor code fixes

imixs · Feb 16, 2024 · 65ccfd5 · 65ccfd5
1 parent eab43c3
commit 65ccfd5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 25 deletions.
diff --git a/....glsp-server/src/main/java/org/openbpmn/glsp/elements/CreateBPMNEdgeOperationHandler.java b/....glsp-server/src/main/java/org/openbpmn/glsp/elements/CreateBPMNEdgeOperationHandler.java
@@ -40,8 +40,10 @@ public CreateBPMNEdgeOperationHandler(final String elementTypeId) {
         super(elementTypeId);
     }
 
+    @SuppressWarnings("null")
     public CreateBPMNEdgeOperationHandler(final String... elementTypeIds) {
         super(Lists.newArrayList(elementTypeIds));
+
     }
 
     public CreateBPMNEdgeOperationHandler(final List<String> handledElementTypeIds) {

diff --git a/....glsp-server/src/main/java/org/openbpmn/glsp/elements/CreateBPMNNodeOperationHandler.java b/....glsp-server/src/main/java/org/openbpmn/glsp/elements/CreateBPMNNodeOperationHandler.java
@@ -49,6 +49,7 @@ public CreateBPMNNodeOperationHandler(final String elementTypeId) {
         super(elementTypeId);
     }
 
+    @SuppressWarnings("null")
     public CreateBPMNNodeOperationHandler(final String... elementTypeIds) {
         super(Lists.newArrayList(elementTypeIds));
     }
@@ -83,7 +84,6 @@ protected BPMNProcess findProcessByCreateNodeOperation(final CreateNodeOperation
         return BPMNGModelUtil.findProcessByPoint(modelState, dropPoint);
     }
 
-
     /**
      * This method is a helper method to compute the container element. E.g. when a
      * EventDefinition is placed into a Event or when a Extension is placed into a

diff --git a/...mn.glsp-server/src/main/java/org/openbpmn/glsp/elements/event/BPMNCreateEventHandler.java b/...mn.glsp-server/src/main/java/org/openbpmn/glsp/elements/event/BPMNCreateEventHandler.java
@@ -119,12 +119,14 @@ public void executeOperation(final CreateNodeOperation operation) {
                 event = activity.addBoundaryEvent(eventID, getLabel());
             } else {
                 // normal event
-                event = bpmnProcess.addEvent(eventID, getLabel(), operation.getElementTypeId());
+                if (bpmnProcess != null) {
+                    event = bpmnProcess.addEvent(eventID, getLabel(), operation.getElementTypeId());
+                }
             }
 
             Optional<GPoint> point = operation.getLocation();
 
-            if (point.isPresent()) {
+            if (event != null && point.isPresent()) {
                 // compute relative center position...
                 BPMNPoint targetPosition = BPMNGridSnapper.center(event, point.get());
                 // compute default label position

diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/model/BPMNGModelFactory.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/model/BPMNGModelFactory.java
@@ -365,26 +365,6 @@ public int compare(Lane obj1, Lane obj2) {
         }
     }
 
-    /**
-     * Helper method that findes a specific GNode in a GNodeList
-     * 
-     * @param id
-     * @param gNodeList
-     * @return
-     */
-    private GModelElement findPoolGNode(String id, List<GModelElement> gNodeList) {
-        if (id == null) {
-            return null;
-        }
-        for (GModelElement element : gNodeList) {
-            if (id.equals(element.getId())) {
-                return element;
-            }
-        }
-        // no match
-        return null;
-    }
-
     /**
      * This method apply all possible BPMNElementExtension to the GNode. This is to
      * build

diff --git a/...src/main/java/org/openbpmn/glsp/operations/BPMNApplyPropertiesUpdateOperationHandler.java b/...src/main/java/org/openbpmn/glsp/operations/BPMNApplyPropertiesUpdateOperationHandler.java
@@ -126,7 +126,9 @@ private void executeOperation(final BPMNApplyPropertiesUpdateOperation operation
 
         // finally we need to update the JSONFormsData property of the selected element
         // See also issue #164
-        gModelElement.getArgs().put("JSONFormsData", json.toString());
+        if (gModelElement != null) {
+            gModelElement.getArgs().put("JSONFormsData", json.toString());
+        }
         logger.debug("....execute Update " + operation.getId() + " in " + (System.currentTimeMillis() - l) + "ms");
 
     }

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
@@ -54,7 +54,8 @@ private void executeOperation(final DeleteOperation operation) {
 
         List<String> elementIds = operation.getElementIds();
         if (elementIds == null || elementIds.size() == 0) {
-            System.out.println("Elements to delete are not specified");
+            logger.fine("Elements to delete are not specified");
+            return;
         }
         for (String id : elementIds) {
             // test if the element is a participant