Bug 422575 - intermediate catch events validation fails
diff --git a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/DataAssociationPropertiesAdapter.java b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/DataAssociationPropertiesAdapter.java
index bb19c47..3dd52c7 100644
--- a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/DataAssociationPropertiesAdapter.java
+++ b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/DataAssociationPropertiesAdapter.java
@@ -278,6 +278,13 @@
updateConnectionIfNeeded(association, value);
association.getSourceRef().set(0,value);
}
+ if (association.getTargetRef()!=null) {
+ ItemAwareElement targetRef = association.getTargetRef();
+ if (value!=null)
+ targetRef.setItemSubjectRef(value.getItemSubjectRef());
+ else
+ targetRef.setItemSubjectRef(null);
+ }
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -290,6 +297,13 @@
}
updateConnectionIfNeeded(association, value);
association.setTargetRef(value);
+ if (!association.getSourceRef().isEmpty()) {
+ ItemAwareElement sourceRef = association.getSourceRef().get(0);
+ if (value!=null)
+ sourceRef.setItemSubjectRef(value.getItemSubjectRef());
+ else
+ sourceRef.setItemSubjectRef(null);
+ }
}
private void updateConnectionIfNeeded(DataAssociation association, ItemAwareElement value) {
