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


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

1 files changed, 5 insertions, 4 deletions

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/src/org/eclipse/papyrus/views/modelexplorer/newchild/ModelExplorerMenuFactory.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/src/org/eclipse/papyrus/views/modelexplorer/newchild/ModelExplorerMenuFactory.java
index 65a3a626110..1bed95feca6 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/src/org/eclipse/papyrus/views/modelexplorer/newchild/ModelExplorerMenuFactory.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/src/org/eclipse/papyrus/views/modelexplorer/newchild/ModelExplorerMenuFactory.java
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *   Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.fr - Initial API and implementation
+ *   Patrik Nandorf (Ericsson AB) patrik.nandorf@ericsson.com - Bug 425565 
  *   
  *****************************************************************************/
 
@@ -21,6 +22,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.papyrus.infra.newchild.CreationMenuFactory;
+import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu;
 import org.eclipse.papyrus.infra.widgets.util.RevealResultCommand;
 import org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView;
 import org.eclipse.papyrus.views.modelexplorer.core.ui.pagebookview.MultiViewPageBookView;
@@ -56,12 +58,12 @@ public class ModelExplorerMenuFactory extends CreationMenuFactory {
 	 *
 	 * @param reference
 	 * @param container
-	 * @param extendedType
+	 * @param creationMenu 
 	 * @return
 	 */
 	@Override
-	protected Command buildCommand(EReference reference, EObject container, String extendedType, Map<?, ?> advice) {
-		Command buildCommand = super.buildCommand(reference, container, extendedType, advice);
+	protected Command buildCommand(EReference reference, EObject container, CreationMenu creationMenu, Map<?, ?> advice) {
+		Command buildCommand = super.buildCommand(reference, container, creationMenu, advice);
 
 		if (buildCommand == null || buildCommand == UnexecutableCommand.INSTANCE) {
 			return buildCommand;
@@ -71,7 +73,6 @@ public class ModelExplorerMenuFactory extends CreationMenuFactory {
 			// Wrap command to select created element
 			buildCommand = RevealResultCommand.wrap(buildCommand, viewPart, container);
 		}
-
 		return buildCommand;
 	}