changed type of property ControlFlowVariable::explicitDescription from...

changed type of property ControlFlowVariable::explicitDescription from RandomVariable to ExplicitExpression

git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/DMM/trunk@16309 9e42b895-fcda-4063-8a3b-11be15eb1bbd

edu.kit.ipd.descartes.mm.applicationlevel/model/parameterdependency.ecore

@@ -39,7 +39,7 @@
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="characterization" lowerBound="1"
         eType="#//ModelVariableCharacterizationType"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="explicitDescription" eType="ecore:EClass functions.ecore#//RandomVariable"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="explicitDescription" eType="ecore:EClass functions.ecore#//ExplicitDescription"
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="InfluencedVariableReference">

edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/ControlFlowVariable.java

@@ -3,6 +3,7 @@
  */
 package edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies;
 
+import edu.kit.ipd.descartes.mm.applicationlevel.functions.ExplicitDescription;
 import edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable;
 
 
@@ -65,12 +66,12 @@ public interface ControlFlowVariable extends ModelVariable {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Explicit Description</em>' containment reference.
-	 * @see #setExplicitDescription(RandomVariable)
+	 * @see #setExplicitDescription(ExplicitDescription)
 	 * @see edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterdependenciesPackage#getControlFlowVariable_ExplicitDescription()
 	 * @model containment="true"
 	 * @generated
 	 */
-	RandomVariable getExplicitDescription();
+	ExplicitDescription getExplicitDescription();
 
 	/**
 	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ControlFlowVariable#getExplicitDescription <em>Explicit Description</em>}' containment reference.
@@ -80,5 +81,5 @@ public interface ControlFlowVariable extends ModelVariable {
 	 * @see #getExplicitDescription()
 	 * @generated
 	 */
-	void setExplicitDescription(RandomVariable value);
+	void setExplicitDescription(ExplicitDescription value);
 } // ControlFlowVariable

edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/impl/ControlFlowVariableImpl.java

@@ -3,6 +3,7 @@
  */
 package edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.impl;
 
+import edu.kit.ipd.descartes.mm.applicationlevel.functions.ExplicitDescription;
 import edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable;
 import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ControlFlowVariable;
 import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ModelVariableCharacterizationType;
@@ -55,7 +56,7 @@ public abstract class ControlFlowVariableImpl extends ModelVariableImpl implemen
 	 * @generated
 	 * @ordered
 	 */
-	protected RandomVariable explicitDescription;
+	protected ExplicitDescription explicitDescription;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -102,7 +103,7 @@ public abstract class ControlFlowVariableImpl extends ModelVariableImpl implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public RandomVariable getExplicitDescription() {
+	public ExplicitDescription getExplicitDescription() {
 		return explicitDescription;
 	}
 
@@ -111,8 +112,8 @@ public abstract class ControlFlowVariableImpl extends ModelVariableImpl implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetExplicitDescription(RandomVariable newExplicitDescription, NotificationChain msgs) {
-		RandomVariable oldExplicitDescription = explicitDescription;
+	public NotificationChain basicSetExplicitDescription(ExplicitDescription newExplicitDescription, NotificationChain msgs) {
+		ExplicitDescription oldExplicitDescription = explicitDescription;
 		explicitDescription = newExplicitDescription;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ParameterdependenciesPackage.CONTROL_FLOW_VARIABLE__EXPLICIT_DESCRIPTION, oldExplicitDescription, newExplicitDescription);
@@ -126,7 +127,7 @@ public abstract class ControlFlowVariableImpl extends ModelVariableImpl implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setExplicitDescription(RandomVariable newExplicitDescription) {
+	public void setExplicitDescription(ExplicitDescription newExplicitDescription) {
 		if (newExplicitDescription != explicitDescription) {
 			NotificationChain msgs = null;
 			if (explicitDescription != null)
@@ -182,7 +183,7 @@ public abstract class ControlFlowVariableImpl extends ModelVariableImpl implemen
 				setCharacterization((ModelVariableCharacterizationType)newValue);
 				return;
 			case ParameterdependenciesPackage.CONTROL_FLOW_VARIABLE__EXPLICIT_DESCRIPTION:
-				setExplicitDescription((RandomVariable)newValue);
+				setExplicitDescription((ExplicitDescription)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -200,7 +201,7 @@ public abstract class ControlFlowVariableImpl extends ModelVariableImpl implemen
 				setCharacterization(CHARACTERIZATION_EDEFAULT);
 				return;
 			case ParameterdependenciesPackage.CONTROL_FLOW_VARIABLE__EXPLICIT_DESCRIPTION:
-				setExplicitDescription((RandomVariable)null);
+				setExplicitDescription((ExplicitDescription)null);
 				return;
 		}
 		super.eUnset(featureID);

edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/impl/ParameterdependenciesPackageImpl.java

@@ -845,7 +845,7 @@ public class ParameterdependenciesPackageImpl extends EPackageImpl implements Pa
 
 		initEClass(controlFlowVariableEClass, ControlFlowVariable.class, "ControlFlowVariable", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getControlFlowVariable_Characterization(), this.getModelVariableCharacterizationType(), "characterization", null, 1, 1, ControlFlowVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getControlFlowVariable_ExplicitDescription(), theFunctionsPackage.getRandomVariable(), null, "explicitDescription", null, 0, 1, ControlFlowVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getControlFlowVariable_ExplicitDescription(), theFunctionsPackage.getExplicitDescription(), null, "explicitDescription", null, 0, 1, ControlFlowVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(influencedVariableReferenceEClass, InfluencedVariableReference.class, "InfluencedVariableReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getInfluencedVariableReference_GetInfluencedVariable(), this.getModelVariable(), null, "getInfluencedVariable", null, 1, 1, InfluencedVariableReference.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
@@ -926,7 +926,7 @@ public class ParameterdependenciesPackageImpl extends EPackageImpl implements Pa
 	 * @generated
 	 */
 	protected void createImportAnnotations() {
-		String source = "http://www.eclipse.org/OCL/Import";		
+		String source = "http://www.eclipse.org/OCL/Import";	
 		addAnnotation
 		  (this, 
 		   source, 
@@ -936,7 +936,7 @@ public class ParameterdependenciesPackageImpl extends EPackageImpl implements Pa
 			 "servicebehavior_0", "servicebehavior.ecore#/",
 			 "functions_0", "functions.ecore#/",
 			 "core_0", "/resource/edu.kit.ipd.descartes.core/model/core.ecore#/"
-		   });																				
+		   });
 	}
 
 	/**
@@ -946,7 +946,7 @@ public class ParameterdependenciesPackageImpl extends EPackageImpl implements Pa
 	 * @generated
 	 */
 	protected void createEcoreAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore";			
+		String source = "http://www.eclipse.org/emf/2002/Ecore";	
 		addAnnotation
 		  (this, 
 		   source, 
@@ -954,61 +954,61 @@ public class ParameterdependenciesPackageImpl extends EPackageImpl implements Pa
 			 "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot",
 			 "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot",
 			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"
-		   });		
+		   });	
 		addAnnotation
 		  (controlFlowVariableEClass, 
 		   source, 
 		   new String[] {
 			 "constraints", "EnforceExplicitDescriptionWhenExplicitCharacterizationType"
-		   });			
+		   });	
 		addAnnotation
 		  (influencedVariableReferenceEClass, 
 		   source, 
 		   new String[] {
 			 "constraints", "ExactlyOneVariableReferenced"
-		   });				
+		   });	
 		addAnnotation
 		  (relationshipEClass, 
 		   source, 
 		   new String[] {
 			 "constraints", "EnforceExplicitDescriptionWhenExplicitCharacterizationType"
-		   });			
+		   });	
 		addAnnotation
 		  (dependencyRelationshipEClass, 
 		   source, 
 		   new String[] {
 			 "constraints", "DelegationOnlyAllowedWithSingleSource"
-		   });			
+		   });	
 		addAnnotation
 		  (correlationRelationshipEClass, 
 		   source, 
 		   new String[] {
 			 "constraints", "NumberOfSourceInfluencingParametersEqualToSourceComponentInstanceReferences DelegationOnlyAllowedWithSingleSource"
-		   });			
+		   });	
 		addAnnotation
 		  (callParameterEClass, 
 		   source, 
 		   new String[] {
 			 "constraints", "EitherParameterOrReturnTypeOfSignatureReferenced"
-		   });			
+		   });	
 		addAnnotation
 		  (serviceInputParameterEClass, 
 		   source, 
 		   new String[] {
 			 "constraints", "MustReferenceInputParameter"
-		   });			
+		   });	
 		addAnnotation
 		  (externalCallReturnParameterEClass, 
 		   source, 
 		   new String[] {
 			 "constraints", "MustReferenceReturnParameter"
-		   });			
+		   });	
 		addAnnotation
 		  (externalCallParameterEClass, 
 		   source, 
 		   new String[] {
 			 "constraints", "MustReferenceInputParameter"
-		   });	
+		   });
 	}
 
 	/**
@@ -1018,62 +1018,62 @@ public class ParameterdependenciesPackageImpl extends EPackageImpl implements Pa
 	 * @generated
 	 */
 	protected void createPivotAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot";					
+		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot";	
 		addAnnotation
 		  (controlFlowVariableEClass, 
 		   source, 
 		   new String[] {
 			 "EnforceExplicitDescriptionWhenExplicitCharacterizationType", "\n\t\t\tself.characterization = RelationshipCharacterizationType::EXPLICIT implies explicitDescription <> null"
-		   });			
+		   });	
 		addAnnotation
 		  (influencedVariableReferenceEClass, 
 		   source, 
 		   new String[] {
 			 "ExactlyOneVariableReferenced", "\n\t\t\tlet nonnullset : Set(ModelVariable) = Set{controlFlowVariable, resourceDemand, responseTime}->reject(mv|mv = null) \n\t\t\tin nonnullset->size() = 1"
-		   });		
+		   });	
 		addAnnotation
 		  (getInfluencedVariableReference_GetInfluencedVariable(), 
 		   source, 
 		   new String[] {
 			 "derivation", "\n\t\t\t\tlet nonnullset : Set(ModelVariable) = Set{controlFlowVariable, resourceDemand, responseTime}->reject(mv|mv = null) \n\t\t\t\tin nonnullset->any(true)"
-		   });			
+		   });	
 		addAnnotation
 		  (relationshipEClass, 
 		   source, 
 		   new String[] {
 			 "EnforceExplicitDescriptionWhenExplicitCharacterizationType", "\n\t\t\tself.characterization = RelationshipCharacterizationType::EXPLICIT implies explicitDescription <> null"
-		   });			
+		   });	
 		addAnnotation
 		  (dependencyRelationshipEClass, 
 		   source, 
 		   new String[] {
 			 "DelegationOnlyAllowedWithSingleSource", "\n\t\t\tself.characterization = RelationshipCharacterizationType::IDENTITY implies sources->size() = 1"
-		   });			
+		   });	
 		addAnnotation
 		  (correlationRelationshipEClass, 
 		   source, 
 		   new String[] {
 			 "NumberOfSourceInfluencingParametersEqualToSourceComponentInstanceReferences", "\n\t\t\tsources->size() = destination->size()",
 			 "DelegationOnlyAllowedWithSingleSource", "\n\t\t\tself.characterization = RelationshipCharacterizationType::IDENTITY implies sources->size() = 1"
-		   });			
+		   });	
 		addAnnotation
 		  (callParameterEClass, 
 		   source, 
 		   new String[] {
 			 "EitherParameterOrReturnTypeOfSignatureReferenced", "\n\t\t\t(self.parameter.oclIsUndefined() implies (not self.returnType.oclIsUndefined() and self.signature.returnType = self.returnType)) and\n\t\t\t(self.returnType.oclIsUndefined() implies (not self.parameter.oclIsUndefined() and self.signature.parameters->includes(self.parameter)))"
-		   });			
+		   });	
 		addAnnotation
 		  (serviceInputParameterEClass, 
 		   source, 
 		   new String[] {
 			 "MustReferenceInputParameter", "not self.parameter.oclIsUndefined()"
-		   });			
+		   });	
 		addAnnotation
 		  (externalCallReturnParameterEClass, 
 		   source, 
 		   new String[] {
 			 "MustReferenceReturnParameter", "not self.returnType.oclIsUndefined()"
-		   });			
+		   });	
 		addAnnotation
 		  (externalCallParameterEClass, 
 		   source,