diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore b/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore index f8e1152389d6a34841eec4f46638bfce528ae9b1..472d1557bf10089dbee8971b938a4e1fa90407ad 100644 --- a/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore +++ b/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore @@ -61,8 +61,8 @@ <eClassifiers xsi:type="ecore:EClass" name="ForkAction" eSuperTypes="#//AbstractAction"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="withSynchronizationBarrier" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="forkedBehaviors" ordered="false" - upperBound="-1" eType="#//ComponentInternalBehavior" containment="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="forkedBehaviors" upperBound="-1" + eType="#//ComponentInternalBehavior" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="BranchAction" eSuperTypes="#//AbstractAction"> <eStructuralFeatures xsi:type="ecore:EReference" name="branches" upperBound="-1" 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 771110f7eaf036b41e8af8b670855ee1d470ebde..d06ed3f5695336a6d2a7df0818e1b88aa5285ab2 100644 --- a/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore.oclinecore +++ b/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore.oclinecore @@ -47,7 +47,7 @@ package servicebehavior : servicebehavior = 'http://www.descartes-research.net/m } class ForkAction extends AbstractAction { attribute withSynchronizationBarrier : Boolean; - property forkedBehaviors : ComponentInternalBehavior[*] { composes }; + property forkedBehaviors : ComponentInternalBehavior[*] { composes, ordered }; } class BranchAction extends AbstractAction { property branches : ComponentInternalBehavior[*] { composes, ordered }; diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/ForkAction.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/ForkAction.java index a701fa7e34a373c760043323d52c93ae642677bf..14aba29350e25d315f9c9e11187f76b45db88a4b 100644 --- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/ForkAction.java +++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/ForkAction.java @@ -60,7 +60,7 @@ public interface ForkAction extends AbstractAction { * <!-- end-user-doc --> * @return the value of the '<em>Forked Behaviors</em>' containment reference list. * @see edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage#getForkAction_ForkedBehaviors() - * @model containment="true" ordered="false" + * @model containment="true" * @generated */ EList<ComponentInternalBehavior> getForkedBehaviors(); 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 608c450a4914795865fc4ea5d5e80c2071d0ceae..8704e3f1a0c3692cee43d230d33dce70537ebde1 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 @@ -1035,7 +1035,7 @@ public class ServicebehaviorPackageImpl extends EPackageImpl implements Serviceb 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); - initEReference(getForkAction_ForkedBehaviors(), this.getComponentInternalBehavior(), null, "forkedBehaviors", null, 0, -1, ForkAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + initEReference(getForkAction_ForkedBehaviors(), this.getComponentInternalBehavior(), null, "forkedBehaviors", null, 0, -1, ForkAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(branchActionEClass, BranchAction.class, "BranchAction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getBranchAction_Branches(), this.getComponentInternalBehavior(), null, "branches", null, 0, -1, BranchAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);