diff options
Diffstat (limited to 'plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/parts/MergeNodeEditPart.java')
| -rw-r--r-- | plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/parts/MergeNodeEditPart.java | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/parts/MergeNodeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/parts/MergeNodeEditPart.java index e5548359575..139d3f659f4 100644 --- a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/parts/MergeNodeEditPart.java +++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/parts/MergeNodeEditPart.java @@ -461,6 +461,18 @@ UMLNodeEditPart { if(targetEditPart instanceof OutputPinInReadStructuralFeatureAsResultEditPart) {
types.add(UMLElementTypes.ObjectFlow_4003);
}
+ if(targetEditPart instanceof AddStructuralFeatureValueActionEditPart) {
+ types.add(UMLElementTypes.ObjectFlow_4003);
+ }
+ if(targetEditPart instanceof InputPinInAddStructuralFeatureValueActionAsObjectEditPart) {
+ types.add(UMLElementTypes.ObjectFlow_4003);
+ }
+ if(targetEditPart instanceof InputPinInAddStructuralFeatureValueActionAsValueEditPart) {
+ types.add(UMLElementTypes.ObjectFlow_4003);
+ }
+ if(targetEditPart instanceof OutputPinInAddStructuralFeatureValueActionAsResultEditPart) {
+ types.add(UMLElementTypes.ObjectFlow_4003);
+ }
if(targetEditPart instanceof InitialNodeEditPart) {
types.add(UMLElementTypes.ControlFlow_4004);
}
@@ -638,6 +650,18 @@ UMLNodeEditPart { if(targetEditPart instanceof OutputPinInReadStructuralFeatureAsResultEditPart) {
types.add(UMLElementTypes.ControlFlow_4004);
}
+ if(targetEditPart instanceof AddStructuralFeatureValueActionEditPart) {
+ types.add(UMLElementTypes.ControlFlow_4004);
+ }
+ if(targetEditPart instanceof InputPinInAddStructuralFeatureValueActionAsObjectEditPart) {
+ types.add(UMLElementTypes.ControlFlow_4004);
+ }
+ if(targetEditPart instanceof InputPinInAddStructuralFeatureValueActionAsValueEditPart) {
+ types.add(UMLElementTypes.ControlFlow_4004);
+ }
+ if(targetEditPart instanceof OutputPinInAddStructuralFeatureValueActionAsResultEditPart) {
+ types.add(UMLElementTypes.ControlFlow_4004);
+ }
return types;
}
@@ -706,6 +730,10 @@ UMLNodeEditPart { types.add(UMLElementTypes.ReadStructuralFeatureAction_3088);
types.add(UMLElementTypes.InputPin_3089);
types.add(UMLElementTypes.OutputPin_3090);
+ types.add(UMLElementTypes.AddStructuralFeatureValueAction_3091);
+ types.add(UMLElementTypes.InputPin_3092);
+ types.add(UMLElementTypes.InputPin_3093);
+ types.add(UMLElementTypes.OutputPin_3094);
} else if(relationshipType == UMLElementTypes.ControlFlow_4004) {
types.add(UMLElementTypes.InitialNode_3004);
types.add(UMLElementTypes.ActivityFinalNode_3005);
@@ -766,6 +794,10 @@ UMLNodeEditPart { types.add(UMLElementTypes.ReadStructuralFeatureAction_3088);
types.add(UMLElementTypes.InputPin_3089);
types.add(UMLElementTypes.OutputPin_3090);
+ types.add(UMLElementTypes.AddStructuralFeatureValueAction_3091);
+ types.add(UMLElementTypes.InputPin_3092);
+ types.add(UMLElementTypes.InputPin_3093);
+ types.add(UMLElementTypes.OutputPin_3094);
}
return types;
}
@@ -846,6 +878,10 @@ UMLNodeEditPart { types.add(UMLElementTypes.ReadStructuralFeatureAction_3088);
types.add(UMLElementTypes.InputPin_3089);
types.add(UMLElementTypes.OutputPin_3090);
+ types.add(UMLElementTypes.AddStructuralFeatureValueAction_3091);
+ types.add(UMLElementTypes.InputPin_3092);
+ types.add(UMLElementTypes.InputPin_3093);
+ types.add(UMLElementTypes.OutputPin_3094);
} else if(relationshipType == UMLElementTypes.ControlFlow_4004) {
types.add(UMLElementTypes.InitialNode_3004);
types.add(UMLElementTypes.ActivityFinalNode_3005);
@@ -906,6 +942,10 @@ UMLNodeEditPart { types.add(UMLElementTypes.ReadStructuralFeatureAction_3088);
types.add(UMLElementTypes.InputPin_3089);
types.add(UMLElementTypes.OutputPin_3090);
+ types.add(UMLElementTypes.AddStructuralFeatureValueAction_3091);
+ types.add(UMLElementTypes.InputPin_3092);
+ types.add(UMLElementTypes.InputPin_3093);
+ types.add(UMLElementTypes.OutputPin_3094);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4006) {
types.add(UMLElementTypes.Comment_3080);
}
|