1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ModelingAssistantProviderRule.xtend b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ModelingAssistantProviderRule.xtend
index 2f5530fdf7d..d6e4ef71e3e 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ModelingAssistantProviderRule.xtend
+++ b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ModelingAssistantProviderRule.xtend
@@ -42,6 +42,7 @@ class ModelingAssistantProviderRule extends org.eclipse.papyrus.uml.profile.assi
                 // Popup assistants to create non-relationships
                 popupAssistants.add(type.toPopupAssistant)
             } else {
+                relationshipTypeIDs.add(type.identifier)
                 connectionAssistants.add(type.toConnectionAssistant)
             }
         ]
@@ -50,7 +51,8 @@ class ModelingAssistantProviderRule extends org.eclipse.papyrus.uml.profile.assi
     def create createModelingAssistantProvider toModelingAssistantProvider(GenEditorGenerator editor) {
         name = editor.modelID
         elementTypeIDs.addAll(editor.diagram.validNodes.map[elementType?.uniqueIdentifier].filterNull)
-        elementTypeIDs.addAll(editor.diagram.validLinks.map[elementType?.uniqueIdentifier].filterNull)
+        relationshipTypeIDs.addAll(editor.diagram.validLinks.map[elementType?.uniqueIdentifier].filterNull)
+        elementTypeIDs.addAll(relationshipTypeIDs)
         
         popupAssistants.addAll(editor.diagram.validNodes.map[toPopupAssistant])
         connectionAssistants.addAll(editor.diagram.validLinks.map[toConnectionAssistant])