Skip to content

Commit 2b79f33

Browse files
ebousseebousse
committed
[GenericTrace] make 'tracedObjects' and 'values' unordered
1 parent 554603a commit 2b79f33

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

‎trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/GenericTrace.ecore‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@
134134
containment="true">
135135
<eGenericType eTypeParameter="#//Trace/StepSubType"/>
136136
</eStructuralFeatures>
137-
<eStructuralFeatures xsi:type="ecore:EReference" name="tracedObjects" upperBound="-1"
138-
containment="true">
137+
<eStructuralFeatures xsi:type="ecore:EReference" name="tracedObjects" ordered="false"
138+
upperBound="-1" containment="true">
139139
<eGenericType eTypeParameter="#//Trace/TracedObjectSubtype"/>
140140
</eStructuralFeatures>
141141
<eStructuralFeatures xsi:type="ecore:EReference" name="states" upperBound="-1"
@@ -207,8 +207,8 @@
207207
eOpposite="#//Step/endingState">
208208
<eGenericType eTypeParameter="#//State/StepSubType"/>
209209
</eStructuralFeatures>
210-
<eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
211-
eOpposite="#//Value/states">
210+
<eStructuralFeatures xsi:type="ecore:EReference" name="values" ordered="false"
211+
upperBound="-1" eOpposite="#//Value/states">
212212
<eGenericType eTypeParameter="#//State/ValueSubType"/>
213213
</eStructuralFeatures>
214214
</eClassifiers>

‎trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/State.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public interface State<StepSubType extends Step<?>, ValueSubType extends Value<?
8181
* @return the value of the '<em>Values</em>' reference list.
8282
* @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getState_Values()
8383
* @see org.eclipse.gemoc.trace.commons.model.trace.Value#getStates
84-
* @model opposite="states"
84+
* @model opposite="states" ordered="false"
8585
* @generated
8686
*/
8787
EList<ValueSubType> getValues();

‎trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Trace.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public interface Trace<StepSubType extends Step<?>, TracedObjectSubtype extends
7474
* <!-- end-user-doc -->
7575
* @return the value of the '<em>Traced Objects</em>' containment reference list.
7676
* @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getTrace_TracedObjects()
77-
* @model containment="true"
77+
* @model containment="true" ordered="false"
7878
* @generated
7979
*/
8080
EList<TracedObjectSubtype> getTracedObjects();

‎trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TracedObject.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public interface TracedObject<DimensionSubType extends Dimension<?>> extends EOb
4343
* <!-- end-user-doc -->
4444
* @return the value of the '<em>Dimensions</em>' reference list.
4545
* @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getTracedObject_Dimensions()
46-
* @model transient="true" volatile="true"
46+
* @model transient="true" volatile="true" derived="true"
4747
* annotation="http://www.eclipse.org/emf/2002/GenModel get='return getDimensionsInternal();'"
4848
* @generated
4949
*/

‎trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TracePackageImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -857,14 +857,14 @@ public void initializePackageContents() {
857857
g1 = createEGenericType(traceEClass_StepSubType);
858858
initEReference(getTrace_RootStep(), g1, null, "rootStep", null, 1, 1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
859859
g1 = createEGenericType(traceEClass_TracedObjectSubtype);
860-
initEReference(getTrace_TracedObjects(), g1, null, "tracedObjects", null, 0, -1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
860+
initEReference(getTrace_TracedObjects(), g1, null, "tracedObjects", null, 0, -1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
861861
g1 = createEGenericType(traceEClass_StateSubType);
862862
initEReference(getTrace_States(), g1, null, "states", null, 0, -1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
863863
initEReference(getTrace_Launchconfiguration(), theLaunchconfigurationPackage.getLaunchConfiguration(), null, "launchconfiguration", null, 1, 1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
864864

865865
initEClass(tracedObjectEClass, TracedObject.class, "TracedObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
866866
g1 = createEGenericType(tracedObjectEClass_DimensionSubType);
867-
initEReference(getTracedObject_Dimensions(), g1, null, "dimensions", null, 0, -1, TracedObject.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
867+
initEReference(getTracedObject_Dimensions(), g1, null, "dimensions", null, 0, -1, TracedObject.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
868868

869869
EOperation op = initEOperation(getTracedObject__GetDimensionsInternal(), null, "getDimensionsInternal", 0, -1, IS_UNIQUE, IS_ORDERED);
870870
g1 = createEGenericType(tracedObjectEClass_DimensionSubType);
@@ -884,7 +884,7 @@ public void initializePackageContents() {
884884
g1 = createEGenericType(stateEClass_StepSubType);
885885
initEReference(getState_EndedSteps(), g1, this.getStep_EndingState(), "endedSteps", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
886886
g1 = createEGenericType(stateEClass_ValueSubType);
887-
initEReference(getState_Values(), g1, this.getValue_States(), "values", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
887+
initEReference(getState_Values(), g1, this.getValue_States(), "values", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
888888

889889
// Initialize data types
890890
initEDataType(iSerializableEDataType, byte[].class, "ISerializable", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);

0 commit comments

Comments
 (0)