424318: [Component Diagram] a component must be contained by another

component only by the role packagedElement
https://bugs.eclipse.org/bugs/show_bug.cgi?id=424318

8 files changed, 58 insertions, 59 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
index c1d0449c859..4c30da43096 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
@@ -464,9 +464,9 @@
           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>

           <containmentMetaFeature

-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component/packagedElement"/>

           <childMetaFeature

-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component/packagedElement"/>

           <modelElementInitializer

               xsi:type="gmfgen:GenFeatureSeqInitializer">

             <initializers

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.properties
index 27f5beedebc..fca4000f58b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.properties
@@ -58,4 +58,4 @@ metatype.name.Reception_6=Reception
 metatype.name.Interface_3078=Interface

 metatype.name.NamedElement_3072=Interface

 metatype.name.Link_4018=InterfacePortLink

-
\ No newline at end of file
+


diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandCN.java
index 1cc5857c03f..b9d914ae021 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandCN.java
@@ -25,7 +25,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Component;

 import org.eclipse.uml2.uml.UMLFactory;

 

@@ -95,8 +94,8 @@ public class ComponentCreateCommandCN extends EditElementCommand {
 	 */

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 		Component newElement = UMLFactory.eINSTANCE.createComponent();

-		Class owner = (Class)getElementToEdit();

-		owner.getNestedClassifiers().add(newElement);

+		Component owner = (Component)getElementToEdit();

+		owner.getPackagedElements().add(newElement);

 		ElementInitializers.getInstance().init_Component_3070(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest)getRequest()).setNewElement(newElement);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java
index 1441754b117..178e449b721 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java
@@ -65,7 +65,7 @@ public class ComponentCompositeCompartmentCanonicalEditPolicy extends CanonicalE
 	 * @generated

 	 */

 	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getClass_NestedClassifier();

+		return UMLPackage.eINSTANCE.getComponent_PackagedElement();

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java
index 5a3ba74d566..3d894149f17 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java
@@ -65,7 +65,7 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyCN extends Canonica
 	 * @generated

 	 */

 	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getClass_NestedClassifier();

+		return UMLPackage.eINSTANCE.getComponent_PackagedElement();

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java
index 2886b9eb53a..a35ed95732f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java
@@ -65,7 +65,7 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyPCN extends Canonic
 	 * @generated

 	 */

 	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getClass_NestedClassifier();

+		return UMLPackage.eINSTANCE.getComponent_PackagedElement();

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/Messages.java
index 54a67f39fd3..be4969f6055 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/Messages.java
@@ -255,222 +255,222 @@ public class Messages extends NLS {
 	/**

 	 * @generated

 	 */

-	public static String NodesGroup_title;

+	public static String createNodesGroup_title;

 

 	/**

 	 * @generated

 	 */

-	public static String NodesGroup_desc;

+	public static String createNodesGroup_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String LinksGroup_title;

+	public static String createLinksGroup_title;

 

 	/**

 	 * @generated

 	 */

-	public static String LinksGroup_desc;

+	public static String createLinksGroup_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String ConstraintCreationTool_title;

+	public static String createConstraintCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String ConstraintCreationTool_desc;

+	public static String createConstraintCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String CommentCreationTool_title;

+	public static String createCommentCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String CommentCreationTool_desc;

+	public static String createCommentCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String ComponentCreationTool_title;

+	public static String createComponentCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String ComponentCreationTool_desc;

+	public static String createComponentCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String RectancleInterfaceCreationTool_title;

+	public static String createRectancleInterfaceCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String RectancleInterfaceCreationTool_desc;

+	public static String createRectancleInterfaceCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String ModelCreationTool_title;

+	public static String createModelCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String ModelCreationTool_desc;

+	public static String createModelCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String PropertyCreationTool_title;

+	public static String createPropertyCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String PropertyCreationTool_desc;

+	public static String createPropertyCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String OperationCreationTool_title;

+	public static String createOperationCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String OperationCreationTool_desc;

+	public static String createOperationCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String PackageCreationTool_title;

+	public static String createPackageCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String PackageCreationTool_desc;

+	public static String createPackageCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String PortCreationTool_title;

+	public static String createPortCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String PortCreationTool_desc;

+	public static String createPortCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String ReceptionCreationTool_title;

+	public static String createReceptionCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String ReceptionCreationTool_desc;

+	public static String createReceptionCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String LinkCreationTool_title;

+	public static String createLinkCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String LinkCreationTool_desc;

+	public static String createLinkCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String DependencyCreationTool_title;

+	public static String createDependencyCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String DependencyCreationTool_desc;

+	public static String createDependencyCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String DependencyBranchCreationTool_title;

+	public static String createDependencyBranchCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String DependencyBranchCreationTool_desc;

+	public static String createDependencyBranchCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String AbstractionCreationTool_title;

+	public static String createAbstractionCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String AbstractionCreationTool_desc;

+	public static String createAbstractionCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String ManifestationCreationTool_title;

+	public static String createManifestationCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String ManifestationCreationTool_desc;

+	public static String createManifestationCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String GeneralizationCreationTool_title;

+	public static String createGeneralizationCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String GeneralizationCreationTool_desc;

+	public static String createGeneralizationCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String UsageCreationTool_title;

+	public static String createUsageCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String UsageCreationTool_desc;

+	public static String createUsageCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String SubstitutionCreationTool_title;

+	public static String createSubstitutionCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String SubstitutionCreationTool_desc;

+	public static String createSubstitutionCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String InterfaceRealizationCreationTool_title;

+	public static String createInterfaceRealizationCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String InterfaceRealizationCreationTool_desc;

+	public static String createInterfaceRealizationCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String ComponentRealizationCreationTool_title;

+	public static String createComponentRealizationCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String ComponentRealizationCreationTool_desc;

+	public static String createComponentRealizationCreationTool_desc;

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdater.java
index 6a0cbebb203..7d0aae5f03d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdater.java
@@ -275,8 +275,8 @@ public class UMLDiagramUpdater {
 		}

 		Component modelElement = (Component)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier)it.next();

+		for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {

+			PackageableElement childElement = (PackageableElement)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if(visualID == ComponentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

@@ -523,8 +523,8 @@ public class UMLDiagramUpdater {
 		}

 		Component modelElement = (Component)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier)it.next();

+		for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {

+			PackageableElement childElement = (PackageableElement)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if(visualID == ComponentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

@@ -547,8 +547,8 @@ public class UMLDiagramUpdater {
 		}

 		Component modelElement = (Component)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier)it.next();

+		for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {

+			PackageableElement childElement = (PackageableElement)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if(visualID == ComponentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));