Bug 425565 - [Model Explorer] Cannot create certain relationships in

model explorer, specifically UML Dependency
https://bugs.eclipse.org/bugs/show_bug.cgi?id=425565

org.eclipse.papyrus.infra.newchild
- added a new element (CreateRelationshipMenu) for relationships in
elementCreationMenuModel.ecore
- Update the CreationMenuFactory to handle creating createcommands based
on CreateRelationshipMenu
- Added SetTargetAndRelationshipCommand wrapper command for creating
relationships from the model explorer.

org.eclipse.papyrus.views.modelexplorer.newchild
 - changed the build command to use creationMenu rather than the
elementType directly

org.eclipse.papyrus.uml.service.types.test
- Added several unit tests to CreateReationshipTest
- Added severaltest elements to the TestModel.uml needed by the tests
- added the Standard profile to the test model to allow creation of
Refine and Trace

Change-Id: I42aeb8f153c0c0a08f8e20f9a4cefd3fd9788b70
Signed-off-by: Patrik Nandorf <patrik.nandorf@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/46051
Tested-by: Hudson CI
Reviewed-by: Remi Schnekenburger <remi.schnekenburger@cea.fr>
Tested-by: Remi Schnekenburger <remi.schnekenburger@cea.fr>

1 files changed, 26 insertions, 118 deletions

diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/UMLEdges.creationmenumodel b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/UMLEdges.creationmenumodel
index 07072984331..9175f006969 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/UMLEdges.creationmenumodel
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/UMLEdges.creationmenumodel
@@ -1,120 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ElementCreationMenuModel:Folder
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ElementCreationMenuModel="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel"
-    xmi:id="_-5Z5sN90EeOzMY8AIRUeqQ"
-    label="New Relationship"
-    visible="false">
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_wN-uEeOoWMUBUZPOjA"
-      label="Abstraction"
-      elementTypeIdRef="org.eclipse.papyrus.uml.Abstraction"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_wd-uEeOoWMUBUZPOjA"
-      label="ComponentRealization"
-      elementTypeIdRef="org.eclipse.papyrus.uml.ComponentRealization"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_wt-uEeOoWMUBUZPOjA"
-      label="Connector"
-      elementTypeIdRef="org.eclipse.papyrus.uml.Connector"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_w9-uEeOoWMUBUZPOjA"
-      label="Dependency"
-      elementTypeIdRef="org.eclipse.papyrus.uml.Dependency"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_xN-uEeOoWMUBUZPOjA"
-      label="Deployment"
-      elementTypeIdRef="org.eclipse.papyrus.uml.Deployment"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_xd-uEeOoWMUBUZPOjA"
-      label="ElementImport"
-      elementTypeIdRef="org.eclipse.papyrus.uml.ElementImport"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_xt-uEeOoWMUBUZPOjA"
-      label="Extend"
-      elementTypeIdRef="org.eclipse.papyrus.uml.Extend"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_x9-uEeOoWMUBUZPOjA"
-      label="Generalization"
-      elementTypeIdRef="org.eclipse.papyrus.uml.Generalization"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_yN-uEeOoWMUBUZPOjA"
-      label="Include"
-      elementTypeIdRef="org.eclipse.papyrus.uml.Include"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_yd-uEeOoWMUBUZPOjA"
-      label="InformationFlow"
-      elementTypeIdRef="org.eclipse.papyrus.uml.InformationFlow"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_yt-uEeOoWMUBUZPOjA"
-      label="InterfaceRealization"
-      elementTypeIdRef="org.eclipse.papyrus.uml.InterfaceRealization"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_y9-uEeOoWMUBUZPOjA"
-      label="Manifestation"
-      elementTypeIdRef="org.eclipse.papyrus.uml.Manifestation"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_zN-uEeOoWMUBUZPOjA"
-      label="PackageImport"
-      elementTypeIdRef="org.eclipse.papyrus.uml.PackageImport"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_zd-uEeOoWMUBUZPOjA"
-      label="PackageMerge"
-      elementTypeIdRef="org.eclipse.papyrus.uml.PackageMerge"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_zt-uEeOoWMUBUZPOjA"
-      label="ProfileApplication"
-      elementTypeIdRef="org.eclipse.papyrus.uml.ProfileApplication"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_z9-uEeOoWMUBUZPOjA"
-      label="ProtocolConformance"
-      elementTypeIdRef="org.eclipse.papyrus.uml.ProtocolConformance"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_0N-uEeOoWMUBUZPOjA"
-      label="Realization"
-      elementTypeIdRef="org.eclipse.papyrus.uml.Realization"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_0d-uEeOoWMUBUZPOjA"
-      label="Abstraction"
-      elementTypeIdRef="org.eclipse.papyrus.uml.Refine"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_0t-uEeOoWMUBUZPOjA"
-      label="Substitution"
-      elementTypeIdRef="org.eclipse.papyrus.uml.Substitution"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_09-uEeOoWMUBUZPOjA"
-      label="TemplateBinding"
-      elementTypeIdRef="org.eclipse.papyrus.uml.TemplateBinding"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_1N-uEeOoWMUBUZPOjA"
-      label="Abstraction"
-      elementTypeIdRef="org.eclipse.papyrus.uml.Trace"
-      displayAllRoles="false"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      xmi:id="_SYf_1d-uEeOoWMUBUZPOjA"
-      label="Usage"
-      elementTypeIdRef="org.eclipse.papyrus.uml.Usage"
-      displayAllRoles="false"/>
+<ElementCreationMenuModel:Folder xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ElementCreationMenuModel="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel" xmi:id="_-5Z5sN90EeOzMY8AIRUeqQ" label="New Relationship">
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_wN-uEeOoWMUBUZPOjA" label="Abstraction" elementTypeIdRef="org.eclipse.papyrus.uml.Abstraction" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_1d-uEeOoWMUBUZPOjA" label="Association" elementTypeIdRef="org.eclipse.papyrus.uml.Association" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_wd-uEeOoWMUBUZPOjA" label="ComponentRealization" elementTypeIdRef="org.eclipse.papyrus.uml.ComponentRealization" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_wt-uEeOoWMUBUZPOjA" label="Connector" elementTypeIdRef="org.eclipse.papyrus.uml.Connector" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_1d-uEeOoWMUBUZPOjA" label="Control Flow" elementTypeIdRef="org.eclipse.papyrus.uml.ControlFlow" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_w9-uEeOoWMUBUZPOjA" label="Dependency" elementTypeIdRef="org.eclipse.papyrus.uml.Dependency" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_xN-uEeOoWMUBUZPOjA" label="Deployment" elementTypeIdRef="org.eclipse.papyrus.uml.Deployment" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_xd-uEeOoWMUBUZPOjA" label="ElementImport" elementTypeIdRef="org.eclipse.papyrus.uml.ElementImport" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_xt-uEeOoWMUBUZPOjA" label="Extend" elementTypeIdRef="org.eclipse.papyrus.uml.Extend" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_1d-uEeOoWMUBUZPOjA" label="Extension" visible="false" elementTypeIdRef="org.eclipse.papyrus.uml.Extension" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_x9-uEeOoWMUBUZPOjA" label="Generalization" elementTypeIdRef="org.eclipse.papyrus.uml.Generalization" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_yN-uEeOoWMUBUZPOjA" label="Include" elementTypeIdRef="org.eclipse.papyrus.uml.Include" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_yd-uEeOoWMUBUZPOjA" label="InformationFlow" elementTypeIdRef="org.eclipse.papyrus.uml.InformationFlow" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_yt-uEeOoWMUBUZPOjA" label="InterfaceRealization" elementTypeIdRef="org.eclipse.papyrus.uml.InterfaceRealization" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_y9-uEeOoWMUBUZPOjA" label="Manifestation" elementTypeIdRef="org.eclipse.papyrus.uml.Manifestation" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_zN-uEeOoWMUBUZPOjA" label="PackageImport" elementTypeIdRef="org.eclipse.papyrus.uml.PackageImport" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_zd-uEeOoWMUBUZPOjA" label="PackageMerge" elementTypeIdRef="org.eclipse.papyrus.uml.PackageMerge" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_zt-uEeOoWMUBUZPOjA" label="ProfileApplication" visible="false" elementTypeIdRef="org.eclipse.papyrus.uml.ProfileApplication" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_z9-uEeOoWMUBUZPOjA" label="ProtocolConformance" elementTypeIdRef="org.eclipse.papyrus.uml.ProtocolConformance" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_0N-uEeOoWMUBUZPOjA" label="Realization" elementTypeIdRef="org.eclipse.papyrus.uml.Realization" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_0d-uEeOoWMUBUZPOjA" label="Refine" elementTypeIdRef="org.eclipse.papyrus.uml.Refine" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_0t-uEeOoWMUBUZPOjA" label="Substitution" elementTypeIdRef="org.eclipse.papyrus.uml.Substitution" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_09-uEeOoWMUBUZPOjA" label="TemplateBinding" visible="false" elementTypeIdRef="org.eclipse.papyrus.uml.TemplateBinding" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_1N-uEeOoWMUBUZPOjA" label="Trace" elementTypeIdRef="org.eclipse.papyrus.uml.Trace" displayAllRoles="false"/>
+  <menu xsi:type="ElementCreationMenuModel:CreateRelationshipMenu" xmi:id="_SYf_1d-uEeOoWMUBUZPOjA" label="Usage" elementTypeIdRef="org.eclipse.papyrus.uml.Usage" displayAllRoles="false"/>
 </ElementCreationMenuModel:Folder>