commit 848a9b65a462338df683f29f5a90f4e81938aba4
author Robert Brodt <bbrodt@redhat.com> Fri Aug 26 10:51:23 2016 -0400
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> Fri Aug 26 10:51:23 2016 -0400
tree 8df7f253874e784cf08d3f54727365d9d20f433e
parent 8f302291b7fd6af6119d2c5da40e16e9559d0068
parent 7b0d9a4945b47ca3b890858412a3a1ac99866f53

Merge "Bugfix for Bug 497543"

plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/di/DIImport.java

diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/di/DIImport.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/di/DIImport.java
index 36fa6dc..3fb33bb 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/di/DIImport.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/di/DIImport.java
@@ -759,23 +759,63 @@
 		PictogramElement se = null;
 		PictogramElement te = null;
 
-		// for some reason connectors don't have a common interface
+		/*
+		 * Section 12.2.3.5 of the BPMN2 spec states that a BPMNEdge may provide
+		 * source and target elements, which are:
+		 *  "...optional reference[s] to the edge’s source element if different
+		 *  from the source [or target] inferred from the bpmnElement association."
+		 */
 		if (bpmnElement instanceof MessageFlow ||
 				bpmnElement instanceof SequenceFlow ||
-				bpmnElement instanceof ConversationLink) {
+				bpmnElement instanceof ConversationLink ||
+				bpmnElement instanceof Association) {
 			se = getPictogramElementFromDiagramElement(bpmnEdge.getSourceElement());
 			te = getPictogramElementFromDiagramElement(bpmnEdge.getTargetElement());
+		}
+		
+		// for some reason connectors don't have a common interface
+		if (bpmnElement instanceof MessageFlow) {
+			if (se==null) {
+				source = ((MessageFlow) bpmnElement).getSourceRef();
+				se = elements.get(source);
+			}
+			if (te==null) {
+				target = ((MessageFlow) bpmnElement).getTargetRef();
+				te = elements.get(target);
+			}
+		} else if (bpmnElement instanceof SequenceFlow) {
+			if (se==null) {
+				source = ((SequenceFlow) bpmnElement).getSourceRef();
+				se = elements.get(source);
+			}
+			if (te==null) {
+				target = ((SequenceFlow) bpmnElement).getTargetRef();
+				te = elements.get(target);
+			}
 		} else if (bpmnElement instanceof Association) {
-			se = getPictogramElementFromDiagramElement(bpmnEdge.getSourceElement());
-			te = getPictogramElementFromDiagramElement(bpmnEdge.getTargetElement());
 			if (se==null) {
 				source = ((Association) bpmnElement).getSourceRef();
-				se = getContainerShape((BaseElement)source);
+				se = elements.get(source);
 			}
 			if (te==null) {
 				target = ((Association) bpmnElement).getTargetRef();
+				te = elements.get(target);
+			}
+			if (se==null) {
+				se = getContainerShape((BaseElement)source);
+			}
+			if (te==null) {
 				te = getContainerShape((BaseElement)target);
 			}
+		} else if (bpmnElement instanceof ConversationLink) {
+			if (se==null) {
+				source = ((ConversationLink) bpmnElement).getSourceRef();
+				se = elements.get(source);
+			}
+			if (te==null) {
+				target = ((ConversationLink) bpmnElement).getTargetRef();
+				te = elements.get(target);
+			}
 		} else if (bpmnElement instanceof DataAssociation) {
 			// Data Association allows connections for multiple starting points, we don't support it yet
 			List<ItemAwareElement> sourceRef = ((DataAssociation) bpmnElement).getSourceRef();