bug 352331: [SysML Static Profile] Deprecated constraint on Verify ends is still used (client is not necessarily a TestCase)

https://bugs.eclipse.org/bugs/show_bug.cgi?id=352331

7 files changed, 15 insertions, 22 deletions

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/model/SysML.profile.uml b/plugins/sysml/org.eclipse.papyrus.sysml/model/SysML.profile.uml
index d409c764049..52ed2876ac2 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/model/SysML.profile.uml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/model/SysML.profile.uml
@@ -779,7 +779,8 @@
             <value xsi:nil="true"/>

           </defaultValue>

         </ownedAttribute>

-        <ownedAttribute xmi:id="_PHumALXrEduHWpAaWjM62w" name="verifiedBy" visibility="public" type="_Sb6wELXqEduHWpAaWjM62w" isUnique="false" isReadOnly="true" isDerived="true">

+        <ownedAttribute xmi:id="_PHumALXrEduHWpAaWjM62w" name="verifiedBy" visibility="public" isUnique="false" isReadOnly="true" isDerived="true">

+          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aFIHsLXrEduHWpAaWjM62w" value="*"/>

           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aFCoILXrEduHWpAaWjM62w"/>

           <defaultValue xmi:type="uml:LiteralString" xmi:id="_R1wSgLXrEduHWpAaWjM62w">

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.ecore b/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.ecore
index 9fb0b09137b..be4d66a3efb 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.ecore
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.ecore
@@ -245,8 +245,8 @@
           unique="false" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement"

           changeable="false" volatile="true" transient="true" derived="true"/>

       <eStructuralFeatures xsi:type="ecore:EReference" name="verifiedBy" ordered="false"

-          unique="false" upperBound="-1" eType="#//requirements/TestCase" changeable="false"

-          volatile="true" transient="true" derived="true"/>

+          unique="false" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement"

+          changeable="false" volatile="true" transient="true" derived="true"/>

       <eStructuralFeatures xsi:type="ecore:EReference" name="master" ordered="false"

           unique="false" eType="#//requirements/Requirement" changeable="false" volatile="true"

           transient="true" derived="true"/>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.genmodel b/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.genmodel
index 2fa3be2c4ad..0e17bf90cb3 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.genmodel
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.genmodel
@@ -143,9 +143,9 @@
     <nestedGenPackages prefix="Activities" basePackage="org.eclipse.papyrus.sysml"

         resource="XML" disposableProviderFactory="true" generateExampleClass="false"

         ecorePackage="sysml.ecore#//activities">

-      <genClasses ecoreClass="sysml.ecore#//activities/Optionnal">

+      <genClasses ecoreClass="sysml.ecore#//activities/Optional">

         <genFeatures notify="false" createChild="false" propertySortChoices="true"

-            ecoreFeature="ecore:EReference sysml.ecore#//activities/Optionnal/base_Parameter"/>

+            ecoreFeature="ecore:EReference sysml.ecore#//activities/Optional/base_Parameter"/>

       </genClasses>

       <genClasses ecoreClass="sysml.ecore#//activities/Rate">

         <genFeatures notify="false" createChild="false" propertySortChoices="true"

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Requirement.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Requirement.java
index 6827f4581e0..bfc75ab0beb 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Requirement.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Requirement.java
@@ -188,7 +188,7 @@ public interface Requirement extends EObject {
 

 	/**

 	 * Returns the value of the '<em><b>Verified By</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.sysml.requirements.TestCase}.

+	 * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Verified By</em>' reference list isn't clear, there really should be more of a description here...

@@ -200,7 +200,7 @@ public interface Requirement extends EObject {
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"

 	 * @generated

 	 */

-	EList<TestCase> getVerifiedBy();

+	EList<NamedElement> getVerifiedBy();

 

 	/**

 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getBase_Class <em>Base Class</em>}' reference.

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/impl/RequirementImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/impl/RequirementImpl.java
index b9e2e88222e..a10a1ed4fc6 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/impl/RequirementImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/impl/RequirementImpl.java
@@ -28,7 +28,6 @@ import org.eclipse.papyrus.sysml.requirements.DeriveReqt;
 import org.eclipse.papyrus.sysml.requirements.Requirement;

 import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

 import org.eclipse.papyrus.sysml.requirements.Satisfy;

-import org.eclipse.papyrus.sysml.requirements.TestCase;

 import org.eclipse.papyrus.sysml.requirements.Verify;

 import org.eclipse.papyrus.sysml.util.ElementUtil;

 import org.eclipse.papyrus.uml.standard.Refine;

@@ -489,9 +488,9 @@ public class RequirementImpl extends EObjectImpl implements Requirement {
 	 * 

 	 * @generated NOT

 	 */

-	public EList<TestCase> getVerifiedBy() {

-		// This should return the TestCase verifying current Requirement

-		EList<TestCase> verifiedBy = new BasicEList<TestCase>();

+	public EList<NamedElement> getVerifiedBy() {

+		// This should return the list of NamedElement verifying current Requirement

+		EList<NamedElement> verifiedBy = new BasicEList<NamedElement>();

 		Verify currentVerify = null;

 

 		if(getBase_Class() != null) {

@@ -503,19 +502,12 @@ public class RequirementImpl extends EObjectImpl implements Requirement {
 				currentVerify = (Verify)ElementUtil.hasStereotype(currentDRelationship, RequirementsPackage.eINSTANCE.getVerify());

 

 				if(currentVerify != null) {

-					EList<NamedElement> clients = currentVerify.getBase_Abstraction().getClients();

-					Iterator<NamedElement> it = clients.iterator();

-					while(it.hasNext()) {

-						TestCase currentRequirement = (TestCase)ElementUtil.hasStereotype(it.next(), RequirementsPackage.eINSTANCE.getTestCase());

-						if(currentRequirement != null) {

-							verifiedBy.add(currentRequirement);

-						}

-					}

+					verifiedBy.addAll(currentVerify.getBase_Abstraction().getClients());

 				}

 			}

 		}

 		// Convert to InternalEList<?>

-		return new BasicInternalEList<TestCase>(TestCase.class, verifiedBy.size(), verifiedBy.toArray());

+		return new BasicInternalEList<NamedElement>(NamedElement.class, verifiedBy.size(), verifiedBy.toArray());

 	}

 

 	/**

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/impl/RequirementsPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/impl/RequirementsPackageImpl.java
index 85f3b382665..7552971d28d 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/impl/RequirementsPackageImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/impl/RequirementsPackageImpl.java
@@ -548,7 +548,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 		initEReference(getRequirement_SatisfiedBy(), theUMLPackage.getNamedElement(), null, "satisfiedBy", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

 		initEReference(getRequirement_RefinedBy(), theUMLPackage.getNamedElement(), null, "refinedBy", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

 		initEReference(getRequirement_TracedTo(), theUMLPackage.getNamedElement(), null, "tracedTo", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

-		initEReference(getRequirement_VerifiedBy(), this.getTestCase(), null, "verifiedBy", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

+		initEReference(getRequirement_VerifiedBy(), theUMLPackage.getNamedElement(), null, "verifiedBy", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

 		initEReference(getRequirement_Master(), this.getRequirement(), null, "master", null, 0, 1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

 		initEReference(getRequirement_Base_Class(), theUMLPackage.getClass_(), null, "base_Class", null, 1, 1, Requirement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/ElementUtil.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/ElementUtil.java
index 42b2f754fff..6a602fe18a9 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/ElementUtil.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/ElementUtil.java
@@ -50,7 +50,7 @@ public class ElementUtil {
 
 		return stereotypeApplication;
 	}
-	
+
 	/**
 	 * Convenient method to retrieve the StereotypeApplication by passing an element of the static profile.
 	 *