From ba09f279937cf08b7f2c852729ddd0d7e277f4f3 Mon Sep 17 00:00:00 2001
From: Fabian Brosig <fabian.brosig@uni-wuerzburg.de>
Date: Wed, 26 Nov 2014 13:58:27 +0000
Subject: [PATCH] set ForkAction#forkedBehaviors ordered=TRUE
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/DMM/trunk@16523 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../model/servicebehavior.ecore | 4 ++--
.../model/servicebehavior.ecore.oclinecore | 2 +-
.../mm/applicationlevel/servicebehavior/ForkAction.java | 2 +-
.../servicebehavior/impl/ServicebehaviorPackageImpl.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore b/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore
index f8e11523..472d1557 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 771110f7..d06ed3f5 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 a701fa7e..14aba293 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 608c450a..8704e3f1 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);
--
GitLab