refactoring

Author: rsoika

open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/event/EventNodeBuilder.java

@@ -40,9 +40,12 @@ public class EventNodeBuilder extends AbstractGNodeBuilder<EventNode, EventNodeB
 
     private final String name;
 
-    public EventNodeBuilder(final String type, final String name) {
-        super(type);
-        this.name = name;
+    public EventNodeBuilder(final BPMNEvent event) {
+        super(event.getType());
+        this.name = event.getName();
+        this.id = event.getId();
+
+        // set Layout options
         this.addCssClass("event");
         this.addCssClass(type);
     }

open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/gateway/GatewayNodeBuilder.java

@@ -36,9 +36,19 @@ public class GatewayNodeBuilder extends AbstractGNodeBuilder<GatewayNode, Gatewa
 
     private final String name;
 
-    public GatewayNodeBuilder(final String type, final String name) {
-        super(type);
-        this.name = name;
+//    public GatewayNodeBuilder(final String type, final String name) {
+//        super(type);
+//        this.name = name;
+//        this.addCssClass("gateway");
+//        this.addCssClass(type);
+//    }
+
+    public GatewayNodeBuilder(final BPMNGateway gateway) {
+        super(gateway.getType());
+        this.name = gateway.getName();
+        this.id = gateway.getId();
+
+        // set Layout options
         this.addCssClass("gateway");
         this.addCssClass(type);
     }

open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/pool/PoolNodeBuilder.java

@@ -55,13 +55,6 @@ public class PoolNodeBuilder extends AbstractGNodeBuilder<Pool, PoolNodeBuilder>
     private static final String H_GRAB = "hGrab";
     private static final String H_ALIGN = "hAlign";
 
-//    public PoolNodeBuilder(final String name) {
-//        super(BPMNTypes.POOL);
-//        this.name = name;
-//        this.addCssClass("pool");
-//        this.addCssClass(type);
-//    }
-
     public PoolNodeBuilder(final BPMNParticipant participant) {
         super(BPMNTypes.POOL);
         this.name = participant.getName();

open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/task/BPMNCreateTaskHandler.java

@@ -101,6 +101,8 @@ protected void executeOperation(final CreateNodeOperation operation) {
                 if (point.isPresent()) {
                     task.getBounds().updateLocation(point.get().getX(), point.get().getY());
                     task.getBounds().updateDimension(BPMNActivity.DEFAULT_WIDTH, BPMNActivity.DEFAULT_HEIGHT);
+
+                    logger.info("....Drop Position = " + point.get().getX() + " " + point.get().getY());
                 }
             } else {
                 // should not happen

open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/task/TaskNodeBuilder.java

@@ -15,14 +15,20 @@
  ********************************************************************************/
 package org.openbpmn.glsp.elements.task;
 
+import java.util.logging.Logger;
+
 import org.eclipse.glsp.graph.builder.AbstractGNodeBuilder;
 import org.eclipse.glsp.graph.builder.impl.GArguments;
 import org.eclipse.glsp.graph.builder.impl.GLayoutOptions;
 import org.eclipse.glsp.graph.util.GConstants;
+import org.eclipse.glsp.graph.util.GraphUtil;
 import org.openbpmn.bpmn.elements.BPMNActivity;
+import org.openbpmn.bpmn.elements.BPMNBounds;
+import org.openbpmn.bpmn.exceptions.BPMNMissingElementException;
 import org.openbpmn.glsp.bpmn.BpmnFactory;
 import org.openbpmn.glsp.bpmn.TaskNode;
 import org.openbpmn.glsp.utils.BPMNBuilderHelper;
+import org.openbpmn.model.BPMNGModelFactory;
 
 /**
  * BPMN 2.0 Task Element.
@@ -35,15 +41,27 @@
  */
 public class TaskNodeBuilder extends AbstractGNodeBuilder<TaskNode, TaskNodeBuilder> {
 
+    private static Logger logger = Logger.getLogger(BPMNGModelFactory.class.getName());
+
     private final String name;
 
-    public TaskNodeBuilder(final String type, final String name) {
-        super(type);
-        this.name = name;
+    public TaskNodeBuilder(final BPMNActivity activity) {
+        super(activity.getType());
+        this.name = activity.getName();
+        this.id = activity.getId();
+
+        try {
+            BPMNBounds bpmnBounds = activity.getBounds();
+            this.size = GraphUtil.dimension(bpmnBounds.getDimension().getWidth(),
+                    bpmnBounds.getDimension().getHeight());
+        } catch (BPMNMissingElementException e) {
+            // should not happen
+            logger.severe("BPMNActivity does not support a BPMNBounds object!");
+        }
+        // set Layout options
         this.addCssClass("task");
         this.addCssClass(type);
         this.addArguments(GArguments.cornerRadius(5));
-
     }
 
     @Override

open-bpmn.glsp-server/src/main/java/org/openbpmn/model/BPMNGModelFactory.java

@@ -28,7 +28,6 @@
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.glsp.graph.DefaultTypes;
-import org.eclipse.glsp.graph.GDimension;
 import org.eclipse.glsp.graph.GGraph;
 import org.eclipse.glsp.graph.GLabel;
 import org.eclipse.glsp.graph.GModelElement;
@@ -315,16 +314,11 @@ List<GModelElement> computeGModelElements(final BPMNProcess process, final BPMNP
         // Add all Tasks
         for (BPMNActivity activity : process.getActivities()) {
             logger.fine("activity: " + activity.getName());
+            // compute relative position
             GPoint point = computeGPoint(activity.getBounds(), participant);
-            TaskNodeBuilder builder = new TaskNodeBuilder(activity.getType(), activity.getName());
-            GDimension dimension = GraphUtil.dimension(activity.getBounds().getDimension().getWidth(),
-                    activity.getBounds().getDimension().getHeight());
-
-            // Build the GLSP Node....
-            TaskNode taskNode = builder //
-                    .id(activity.getId()) //
+            // build GNode
+            TaskNode taskNode = new TaskNodeBuilder(activity) //
                     .position(point) //
-                    .size(dimension) //
                     .build();
 
             // apply BPMN Extensions
@@ -335,12 +329,10 @@ List<GModelElement> computeGModelElements(final BPMNProcess process, final BPMNP
         // Add all Events...
         for (BPMNEvent event : process.getEvents()) {
             logger.fine("event: " + event.getName());
-
+            // compute relative position
             GPoint point = computeGPoint(event.getBounds(), participant);
-            EventNodeBuilder builder = new EventNodeBuilder(event.getType(), event.getName());
-            // Build the GLSP Node....
-            EventNode eventNode = builder //
-                    .id(event.getId()) //
+            // build GNode
+            EventNode eventNode = new EventNodeBuilder(event) //
                     .position(point) //
                     .build();
 
@@ -382,12 +374,12 @@ List<GModelElement> computeGModelElements(final BPMNProcess process, final BPMNP
         for (BPMNGateway gateway : process.getGateways()) {
             logger.fine("gateway: " + gateway.getName());
             GPoint point = computeGPoint(gateway.getBounds(), participant);
-            GatewayNodeBuilder builder = new GatewayNodeBuilder(gateway.getType(), gateway.getName());
+
             // Build the GLSP Node....
-            GatewayNode gatewayNode = builder //
-                    .id(gateway.getId()) //
+            GatewayNode gatewayNode = new GatewayNodeBuilder(gateway) //
                     .position(point) //
                     .build();
+
             gNodeList.add(gatewayNode);
             // apply BPMN Extensions
             applyBPMNExtensions(gatewayNode, gateway);