diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore b/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore
index 9fe072067bc5035c4340ea1f080519c781c9dad4..81ffea5b34e86c9e8c989d25a1c35f1188692f68 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore
@@ -25,9 +25,8 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="interfaceProvidingRoles"
ordered="false" upperBound="-1" eType="#//InterfaceProvidingRole" containment="true"
eOpposite="#//InterfaceProvidingRole/interfaceProvidingEntity"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="blackBoxBehavior" ordered="false"
- upperBound="-1" eType="ecore:EClass servicebehavior.ecore#//BlackBoxBehavior"
- containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="blackBoxBehavior" upperBound="-1"
+ eType="ecore:EClass servicebehavior.ecore#//BlackBoxBehavior" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="InterfaceRequiringEntity" abstract="true"
eSuperTypes="../../edu.kit.ipd.descartes.core/model/core.ecore#//Entity">
@@ -44,7 +43,7 @@
<details key="AtMostOneCoarseGrainedBehaviorPerProvidedService" value="
			not self.coarseGrainedBehavior->isEmpty() implies 
			self.coarseGrainedBehavior->isUnique(cgb1 | cgb1.describedSignature)"/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="coarseGrainedBehavior"
- ordered="false" upperBound="-1" eType="ecore:EClass servicebehavior.ecore#//CoarseGrainedBehavior"
+ upperBound="-1" eType="ecore:EClass servicebehavior.ecore#//CoarseGrainedBehavior"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="relationships" ordered="false"
upperBound="-1" eType="ecore:EClass parameterdependency.ecore#//Relationship"
@@ -161,9 +160,8 @@
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="semaphores" ordered="false"
upperBound="-1" eType="#//Semaphore" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="fineGrainedBehavior" ordered="false"
- upperBound="-1" eType="ecore:EClass servicebehavior.ecore#//FineGrainedBehavior"
- containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="fineGrainedBehavior" upperBound="-1"
+ eType="ecore:EClass servicebehavior.ecore#//FineGrainedBehavior" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Semaphore" eSuperTypes="../../edu.kit.ipd.descartes.core/model/core.ecore#//AdaptableEntity">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="capacity" lowerBound="1"
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore.oclinecore b/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore.oclinecore
index f466911784ad1831dc056a557db6eb8d47a86c4f..97e28bd7bae8bcf4723d00c1f036bad1e7225293 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore.oclinecore
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore.oclinecore
@@ -12,7 +12,7 @@ package repository : repository = 'http://www.descartes-research.net/metamodel/r
abstract class InterfaceProvidingEntity extends core_0::Entity
{
property interfaceProvidingRoles#interfaceProvidingEntity : InterfaceProvidingRole[0..*] { composes };
- property blackBoxBehavior : servicebehavior_0::BlackBoxBehavior[*] { composes };
+ property blackBoxBehavior : servicebehavior_0::BlackBoxBehavior[*] { ordered, composes };
invariant AtMostOneBlackBoxBehaviorPerProvidedService:
not self.blackBoxBehavior->isEmpty() implies
self.blackBoxBehavior->isUnique(bbb1 | bbb1.describedSignature);
@@ -23,7 +23,7 @@ package repository : repository = 'http://www.descartes-research.net/metamodel/r
}
abstract class InterfaceProvidingRequiringEntity extends InterfaceProvidingEntity, InterfaceRequiringEntity
{
- property coarseGrainedBehavior : servicebehavior_0::CoarseGrainedBehavior[*] { composes };
+ property coarseGrainedBehavior : servicebehavior_0::CoarseGrainedBehavior[*] { ordered, composes };
property relationships#surroundingEntity : parameterdependency_0::Relationship[*] { composes };
invariant AtMostOneCoarseGrainedBehaviorPerProvidedService:
not self.coarseGrainedBehavior->isEmpty() implies
@@ -119,7 +119,7 @@ package repository : repository = 'http://www.descartes-research.net/metamodel/r
class BasicComponent extends RepositoryComponent
{
property semaphores : Semaphore[*] { composes };
- property fineGrainedBehavior : servicebehavior_0::FineGrainedBehavior[*] { composes };
+ property fineGrainedBehavior : servicebehavior_0::FineGrainedBehavior[*] { ordered, composes };
invariant AtMostOneFineGrainedBehaviorPerProvidedService:
not self.fineGrainedBehavior->isEmpty() implies
self.fineGrainedBehavior->isUnique(fgb1 | fgb1.describedSignature);
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore b/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore
index 31cdcace9faecdd801bf43a71407dd0a5cef2aa7..ddb3459b5e61dcb9c27457c219155dd726e54fcd 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore
@@ -55,8 +55,8 @@
eType="ecore:EClass repository.ecore#//Semaphore"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="InternalAction" eSuperTypes="#//AbstractAction">
- <eStructuralFeatures xsi:type="ecore:EReference" name="resourceDemand" ordered="false"
- upperBound="-1" eType="#//ResourceDemand" containment="true" eOpposite="#//ResourceDemand/internalAction"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="resourceDemand" upperBound="-1"
+ eType="#//ResourceDemand" containment="true" eOpposite="#//ResourceDemand/internalAction"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ForkAction" eSuperTypes="#//AbstractAction">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="withSynchronizationBarrier"
@@ -120,10 +120,9 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CoarseGrainedBehavior" eSuperTypes="#//ServiceBehaviorAbstraction">
<eStructuralFeatures xsi:type="ecore:EReference" name="externalCallFrequency"
- ordered="false" upperBound="-1" eType="#//ExternalCallFrequency" containment="true"
- eOpposite="#//ExternalCallFrequency/coarseGrainedBehavior"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="resourceDemand" ordered="false"
- upperBound="-1" eType="#//ResourceDemand" containment="true" eOpposite="#//ResourceDemand/coarseGrainedBehavior"/>
+ upperBound="-1" eType="#//ExternalCallFrequency" containment="true" eOpposite="#//ExternalCallFrequency/coarseGrainedBehavior"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="resourceDemand" upperBound="-1"
+ eType="#//ResourceDemand" containment="true" eOpposite="#//ResourceDemand/coarseGrainedBehavior"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ExternalCallFrequency">
<eStructuralFeatures xsi:type="ecore:EReference" name="coarseGrainedBehavior"
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore.oclinecore b/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore.oclinecore
index d3b99e3f924a7ea17619620370a679cb6e9f844d..f1aca40d690812552fa791627e4dd57324003ad9 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore.oclinecore
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore.oclinecore
@@ -43,7 +43,7 @@ package servicebehavior : servicebehavior = 'http://www.descartes-research.net/m
property semaphore : repository_0::Semaphore[1];
}
class InternalAction extends AbstractAction {
- property resourceDemand#internalAction : ResourceDemand[*] { composes };
+ property resourceDemand#internalAction : ResourceDemand[*] { ordered, composes };
}
class ForkAction extends AbstractAction {
attribute withSynchronizationBarrier : Boolean;
@@ -120,8 +120,8 @@ package servicebehavior : servicebehavior = 'http://www.descartes-research.net/m
class CoarseGrainedBehavior extends ServiceBehaviorAbstraction
{
- property externalCallFrequency#coarseGrainedBehavior : ExternalCallFrequency[*] { composes };
- property resourceDemand#coarseGrainedBehavior : ResourceDemand[*] { composes };
+ property externalCallFrequency#coarseGrainedBehavior : ExternalCallFrequency[*] { ordered, composes };
+ property resourceDemand#coarseGrainedBehavior : ResourceDemand[*] { ordered, composes };
}
class ExternalCallFrequency {
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/BasicComponent.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/BasicComponent.java
index 4c39b55cd8648fecbf71842613e7d95f8d21c48a..8780977b444bf2d957578a0b3efcc083b1eaee20 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/BasicComponent.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/BasicComponent.java
@@ -53,7 +53,7 @@ public interface BasicComponent extends RepositoryComponent {
* <!-- end-user-doc -->
* @return the value of the '<em>Fine Grained Behavior</em>' containment reference list.
* @see edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage#getBasicComponent_FineGrainedBehavior()
- * @model containment="true" ordered="false"
+ * @model containment="true"
* @generated
*/
EList<FineGrainedBehavior> getFineGrainedBehavior();
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingEntity.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingEntity.java
index bfd26d2499e8982456581e83b59441e3a2d0be00..4b5f02cc8c6e2cc8bacbf57f1a021c1fc111aa27 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingEntity.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingEntity.java
@@ -58,7 +58,7 @@ public interface InterfaceProvidingEntity extends Entity {
* <!-- end-user-doc -->
* @return the value of the '<em>Black Box Behavior</em>' containment reference list.
* @see edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage#getInterfaceProvidingEntity_BlackBoxBehavior()
- * @model containment="true" ordered="false"
+ * @model containment="true"
* @generated
*/
EList<BlackBoxBehavior> getBlackBoxBehavior();
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingRequiringEntity.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingRequiringEntity.java
index 8866a93056f1cb9c4c8690901681e8c9b8faf86b..f2546a9b1bb9d66ee74bc64af4d2f80eab70b93e 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingRequiringEntity.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingRequiringEntity.java
@@ -40,7 +40,7 @@ public interface InterfaceProvidingRequiringEntity extends InterfaceProvidingEnt
* <!-- end-user-doc -->
* @return the value of the '<em>Coarse Grained Behavior</em>' containment reference list.
* @see edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage#getInterfaceProvidingRequiringEntity_CoarseGrainedBehavior()
- * @model containment="true" ordered="false"
+ * @model containment="true"
* @generated
*/
EList<CoarseGrainedBehavior> getCoarseGrainedBehavior();
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/impl/RepositoryPackageImpl.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/impl/RepositoryPackageImpl.java
index 06dbc554fbf67da2b304372fb45feed5c82a8a23..e2c0f5619c2120b50015269076bf70d5bcbdf0b0 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/impl/RepositoryPackageImpl.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/impl/RepositoryPackageImpl.java
@@ -1406,13 +1406,13 @@ public class RepositoryPackageImpl extends EPackageImpl implements RepositoryPac
initEClass(interfaceProvidingEntityEClass, InterfaceProvidingEntity.class, "InterfaceProvidingEntity", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getInterfaceProvidingEntity_InterfaceProvidingRoles(), this.getInterfaceProvidingRole(), this.getInterfaceProvidingRole_InterfaceProvidingEntity(), "interfaceProvidingRoles", null, 0, -1, InterfaceProvidingEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
- initEReference(getInterfaceProvidingEntity_BlackBoxBehavior(), theServicebehaviorPackage.getBlackBoxBehavior(), null, "blackBoxBehavior", null, 0, -1, InterfaceProvidingEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEReference(getInterfaceProvidingEntity_BlackBoxBehavior(), theServicebehaviorPackage.getBlackBoxBehavior(), null, "blackBoxBehavior", null, 0, -1, InterfaceProvidingEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(interfaceRequiringEntityEClass, InterfaceRequiringEntity.class, "InterfaceRequiringEntity", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getInterfaceRequiringEntity_InterfaceRequiringRoles(), this.getInterfaceRequiringRole(), this.getInterfaceRequiringRole_InterfaceRequiringEntity(), "interfaceRequiringRoles", null, 0, -1, InterfaceRequiringEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEClass(interfaceProvidingRequiringEntityEClass, InterfaceProvidingRequiringEntity.class, "InterfaceProvidingRequiringEntity", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getInterfaceProvidingRequiringEntity_CoarseGrainedBehavior(), theServicebehaviorPackage.getCoarseGrainedBehavior(), null, "coarseGrainedBehavior", null, 0, -1, InterfaceProvidingRequiringEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEReference(getInterfaceProvidingRequiringEntity_CoarseGrainedBehavior(), theServicebehaviorPackage.getCoarseGrainedBehavior(), null, "coarseGrainedBehavior", null, 0, -1, InterfaceProvidingRequiringEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getInterfaceProvidingRequiringEntity_Relationships(), theParameterdependenciesPackage.getRelationship(), theParameterdependenciesPackage.getRelationship_SurroundingEntity(), "relationships", null, 0, -1, InterfaceProvidingRequiringEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1460,7 +1460,7 @@ public class RepositoryPackageImpl extends EPackageImpl implements RepositoryPac
initEClass(basicComponentEClass, BasicComponent.class, "BasicComponent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getBasicComponent_Semaphores(), this.getSemaphore(), null, "semaphores", null, 0, -1, BasicComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
- initEReference(getBasicComponent_FineGrainedBehavior(), theServicebehaviorPackage.getFineGrainedBehavior(), null, "fineGrainedBehavior", null, 0, -1, BasicComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEReference(getBasicComponent_FineGrainedBehavior(), theServicebehaviorPackage.getFineGrainedBehavior(), null, "fineGrainedBehavior", null, 0, -1, BasicComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(semaphoreEClass, Semaphore.class, "Semaphore", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getSemaphore_Capacity(), ecorePackage.getEBigInteger(), "capacity", null, 1, 1, Semaphore.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/CoarseGrainedBehavior.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/CoarseGrainedBehavior.java
index 20fe82f111995562a634026a25d4324675b24d32..e4820ec778f423c1e7e4ad7f223e61b088ef4afe 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/CoarseGrainedBehavior.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/CoarseGrainedBehavior.java
@@ -36,7 +36,7 @@ public interface CoarseGrainedBehavior extends ServiceBehaviorAbstraction {
* @return the value of the '<em>External Call Frequency</em>' containment reference list.
* @see edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage#getCoarseGrainedBehavior_ExternalCallFrequency()
* @see edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCallFrequency#getCoarseGrainedBehavior
- * @model opposite="coarseGrainedBehavior" containment="true" ordered="false"
+ * @model opposite="coarseGrainedBehavior" containment="true"
* @generated
*/
EList<ExternalCallFrequency> getExternalCallFrequency();
@@ -54,7 +54,7 @@ public interface CoarseGrainedBehavior extends ServiceBehaviorAbstraction {
* @return the value of the '<em>Resource Demand</em>' containment reference list.
* @see edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage#getCoarseGrainedBehavior_ResourceDemand()
* @see edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ResourceDemand#getCoarseGrainedBehavior
- * @model opposite="coarseGrainedBehavior" containment="true" ordered="false"
+ * @model opposite="coarseGrainedBehavior" containment="true"
* @generated
*/
EList<ResourceDemand> getResourceDemand();
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/InternalAction.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/InternalAction.java
index 185f878a40176c19fb7c4f1ec6c62719bc80becc..195d468a4cf40e5fb5b216efd1ead2cfed8a4bdf 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/InternalAction.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/InternalAction.java
@@ -35,7 +35,7 @@ public interface InternalAction extends AbstractAction {
* @return the value of the '<em>Resource Demand</em>' containment reference list.
* @see edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage#getInternalAction_ResourceDemand()
* @see edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ResourceDemand#getInternalAction
- * @model opposite="internalAction" containment="true" ordered="false"
+ * @model opposite="internalAction" containment="true"
* @generated
*/
EList<ResourceDemand> getResourceDemand();
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/impl/ServicebehaviorPackageImpl.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/impl/ServicebehaviorPackageImpl.java
index 8704e3f1a0c3692cee43d230d33dce70537ebde1..18bf16f86931bc0dfd9004893ccbc9e7e691dc17 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/impl/ServicebehaviorPackageImpl.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/impl/ServicebehaviorPackageImpl.java
@@ -1031,7 +1031,7 @@ public class ServicebehaviorPackageImpl extends EPackageImpl implements Serviceb
initEReference(getReleaseAction_Semaphore(), theRepositoryPackage.getSemaphore(), null, "semaphore", null, 1, 1, ReleaseAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(internalActionEClass, InternalAction.class, "InternalAction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getInternalAction_ResourceDemand(), this.getResourceDemand(), this.getResourceDemand_InternalAction(), "resourceDemand", null, 0, -1, InternalAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEReference(getInternalAction_ResourceDemand(), this.getResourceDemand(), this.getResourceDemand_InternalAction(), "resourceDemand", null, 0, -1, InternalAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(forkActionEClass, ForkAction.class, "ForkAction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getForkAction_WithSynchronizationBarrier(), ecorePackage.getEBoolean(), "withSynchronizationBarrier", null, 1, 1, ForkAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1066,8 +1066,8 @@ public class ServicebehaviorPackageImpl extends EPackageImpl implements Serviceb
initEReference(getResourceDemand_ExplicitDescription(), theFunctionsPackage.getRandomVariable(), null, "explicitDescription", null, 0, 1, ResourceDemand.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(coarseGrainedBehaviorEClass, CoarseGrainedBehavior.class, "CoarseGrainedBehavior", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getCoarseGrainedBehavior_ExternalCallFrequency(), this.getExternalCallFrequency(), this.getExternalCallFrequency_CoarseGrainedBehavior(), "externalCallFrequency", null, 0, -1, CoarseGrainedBehavior.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
- initEReference(getCoarseGrainedBehavior_ResourceDemand(), this.getResourceDemand(), this.getResourceDemand_CoarseGrainedBehavior(), "resourceDemand", null, 0, -1, CoarseGrainedBehavior.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEReference(getCoarseGrainedBehavior_ExternalCallFrequency(), this.getExternalCallFrequency(), this.getExternalCallFrequency_CoarseGrainedBehavior(), "externalCallFrequency", null, 0, -1, CoarseGrainedBehavior.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCoarseGrainedBehavior_ResourceDemand(), this.getResourceDemand(), this.getResourceDemand_CoarseGrainedBehavior(), "resourceDemand", null, 0, -1, CoarseGrainedBehavior.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(externalCallFrequencyEClass, ExternalCallFrequency.class, "ExternalCallFrequency", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getExternalCallFrequency_CoarseGrainedBehavior(), this.getCoarseGrainedBehavior(), this.getCoarseGrainedBehavior_ExternalCallFrequency(), "coarseGrainedBehavior", null, 1, 1, ExternalCallFrequency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);