Updates for upcoming Designer release

goozi · Aug 6, 2015 · 499ce73 · 499ce73
1 parent ffff1b4
commit 499ce73
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 22 deletions.
diff --git a/...er/src/main/java/org/activiti/bpmn/converter/export/SignalAndMessageDefinitionExport.java b/...er/src/main/java/org/activiti/bpmn/converter/export/SignalAndMessageDefinitionExport.java
@@ -25,16 +25,20 @@ public static void writeSignalsAndMessages(BpmnModel model, XMLStreamWriter xtw)
           EventDefinition eventDefinition = event.getEventDefinitions().get(0);
           if (eventDefinition instanceof SignalEventDefinition) {
             SignalEventDefinition signalEvent = (SignalEventDefinition) eventDefinition;
-            if (model.containsSignalId(signalEvent.getSignalRef()) == false) {
-              Signal signal = new Signal(signalEvent.getSignalRef(), signalEvent.getSignalRef());
-              model.addSignal(signal);
+            if (StringUtils.isNotEmpty(signalEvent.getSignalRef())) {
+              if (model.containsSignalId(signalEvent.getSignalRef()) == false) {
+                Signal signal = new Signal(signalEvent.getSignalRef(), signalEvent.getSignalRef());
+                model.addSignal(signal);
+              }
             }
 
           } else if (eventDefinition instanceof MessageEventDefinition) {
             MessageEventDefinition messageEvent = (MessageEventDefinition) eventDefinition;
-            if (model.containsMessageId(messageEvent.getMessageRef()) == false) {
-              Message message = new Message(messageEvent.getMessageRef(), messageEvent.getMessageRef(), null);
-              model.addMessage(message);
+            if (StringUtils.isNotEmpty(messageEvent.getMessageRef())) {
+              if (model.containsMessageId(messageEvent.getMessageRef()) == false) {
+                Message message = new Message(messageEvent.getMessageRef(), messageEvent.getMessageRef(), null);
+                model.addMessage(message);
+              }
             }
           }
         }

diff --git a/modules/activiti-bpmn-model/src/main/java/org/activiti/bpmn/model/Activity.java b/modules/activiti-bpmn-model/src/main/java/org/activiti/bpmn/model/Activity.java
@@ -111,11 +111,9 @@ public void setValues(Activity otherActivity) {
       }
     }
 
-    boundaryEvents = new ArrayList<BoundaryEvent>();
-    if (otherActivity.getBoundaryEvents() != null && !otherActivity.getBoundaryEvents().isEmpty()) {
-      for (BoundaryEvent event : otherActivity.getBoundaryEvents()) {
-        boundaryEvents.add(event.clone());
-      }
+    boundaryEvents.clear();
+    for (BoundaryEvent event : otherActivity.getBoundaryEvents()) {
+      boundaryEvents.add(event);
     }
   }
 }
diff --git a/modules/activiti-bpmn-model/src/main/java/org/activiti/bpmn/model/SequenceFlow.java b/modules/activiti-bpmn-model/src/main/java/org/activiti/bpmn/model/SequenceFlow.java
@@ -73,5 +73,6 @@ public void setValues(SequenceFlow otherFlow) {
     setConditionExpression(otherFlow.getConditionExpression());
     setSourceRef(otherFlow.getSourceRef());
     setTargetRef(otherFlow.getTargetRef());
+    setSkipExpression(otherFlow.getSkipExpression());
   }
 }
diff --git a/modules/activiti-bpmn-model/src/main/java/org/activiti/bpmn/model/ServiceTask.java b/modules/activiti-bpmn-model/src/main/java/org/activiti/bpmn/model/ServiceTask.java
@@ -106,6 +106,7 @@ public void setValues(ServiceTask otherElement) {
     setType(otherElement.getType());
     setOperationRef(otherElement.getOperationRef());
     setExtensionId(otherElement.getExtensionId());
+    setSkipExpression(otherElement.getSkipExpression());
 
     fieldExtensions = new ArrayList<FieldExtension>();
     if (otherElement.getFieldExtensions() != null && !otherElement.getFieldExtensions().isEmpty()) {

diff --git a/modules/activiti-bpmn-model/src/main/java/org/activiti/bpmn/model/SubProcess.java b/modules/activiti-bpmn-model/src/main/java/org/activiti/bpmn/model/SubProcess.java
@@ -122,19 +122,15 @@ public void setValues(SubProcess otherElement) {
       }
     }
 
-    /*flowElementList = new ArrayList<FlowElement>();
-    if (otherElement.getFlowElements() != null && otherElement.getFlowElements().size() > 0) {
-      for (FlowElement element : otherElement.getFlowElements()) {
-        flowElementList.add(element.clone());
-      }
+    flowElementList.clear();
+    for (FlowElement flowElement : otherElement.getFlowElements()) {
+      addFlowElement(flowElement);
     }
 
-    artifactList = new ArrayList<Artifact>();
-    if (otherElement.getArtifacts() != null && otherElement.getArtifacts().size() > 0) {
-      for (Artifact artifact : otherElement.getArtifacts()) {
-        artifactList.add(artifact.clone());
-      }
-    }*/
+    artifactList.clear();
+    for (Artifact artifact : otherElement.getArtifacts()) {
+      addArtifact(artifact);
+    }
   }
 
   public List<ValuedDataObject> getDataObjects() {

diff --git a/modules/activiti-bpmn-model/src/main/java/org/activiti/bpmn/model/UserTask.java b/modules/activiti-bpmn-model/src/main/java/org/activiti/bpmn/model/UserTask.java
@@ -180,6 +180,7 @@ public void setValues(UserTask otherElement) {
     setPriority(otherElement.getPriority());
     setCategory(otherElement.getCategory());
     setExtensionId(otherElement.getExtensionId());
+    setSkipExpression(otherElement.getSkipExpression());
 
     setCandidateGroups(new ArrayList<String>(otherElement.getCandidateGroups()));
     setCandidateUsers(new ArrayList<String>(otherElement.getCandidateUsers()));