Activity migration on elementtypes framework:

- fix containment feature for expansion node in expansion region 

Change-Id: I9e3b3a104386f51124ed22a3bb032eac350d94f9
Signed-off-by: atischenko <montages.t7@gmail.com>

3 files changed, 16 insertions, 4 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations
index 3820e7d54c2..4ad22a17999 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations
@@ -142,11 +142,11 @@
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbdmaNEeSyJIsxLao1Pw" name="Expansion Node" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_3074" hint="3074">
     <iconEntry xmi:id="_x8Hbd2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ExpansionNode</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsInput</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbeGaNEeSyJIsxLao1Pw" name="Expansion Node" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_3075" hint="3075">
     <iconEntry xmi:id="_x8HbeWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ExpansionNode</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsOutput</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbdGaNEeSyJIsxLao1Pw" name="Expansion Region" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionRegion_3070" hint="3070">
     <iconEntry xmi:id="_x8HbdWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ExpansionRegion.gif" bundleId="org.eclipse.uml2.uml.edit"/>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
index e9012b4c09c..e0b5082bd60 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
@@ -15,4 +15,18 @@
       <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

     </containerConfiguration>

   </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_EcQ3QLocEeSsV_IrhqhBPw" name="Expansion Node" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsInput" hint="ExpansionNode_As_UML::ExpansionRegion::inputElement">

+    <iconEntry xmi:id="_Si-6ULocEeSsV_IrhqhBPw" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExpansionNode</specializedTypesID>

+    <containerConfiguration xmi:id="_xpxzMLocEeSsV_IrhqhBPw">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionRegion/inputElement"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_4YwzsLocEeSsV_IrhqhBPw" name="Expansion Node" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsOutput" hint="ExpansionNode_As_UML::ExpansionRegion::outputElement">

+    <iconEntry xmi:id="_4YwzsbocEeSsV_IrhqhBPw" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExpansionNode</specializedTypesID>

+    <containerConfiguration xmi:id="_4YwzsrocEeSsV_IrhqhBPw">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionRegion/outputElement"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestDropObjects.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestDropObjects.java
index e6c78fb74f7..9fe5c388152 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestDropObjects.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestDropObjects.java
@@ -20,7 +20,6 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
 import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.tooling.runtime.update.DiagramUpdater;
-import org.eclipse.papyrus.junit.framework.classification.FailingTest;
 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityActivityContentCompartmentEditPart;
 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityEditPart;
 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ExpansionNodeAsInEditPart;
@@ -75,7 +74,6 @@ public class TestDropObjects extends AbstractPapyrusTestCase {
 		return findChildBySemanticHint(activityEP, ActivityActivityContentCompartmentEditPart.VISUAL_ID);
 	}
 
-	@FailingTest
 	@Test
 	public void testExpansionNodeInExpansionRegionCompartment() throws Exception {
 		IGraphicalEditPart regionEP = createChild(ExpansionRegionEditPart.VISUAL_ID, getActivityCompartmentEditPart());