Skip to content

Small changes and fixes to the generic trace metamodel #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Small changes and fixes to the generic trace metamodel #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b79f33
[GenericTrace] make 'tracedObjects' and 'values' unordered
ebousse Jul 17, 2017
50e1095
Replace some 'fr.inria.diverse' by 'org.eclipse.gemoc'
ebousse Jul 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/GenericTrace.ecore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@
containment="true">
<eGenericType eTypeParameter="#//Trace/StepSubType"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="tracedObjects" upperBound="-1"
containment="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="tracedObjects" ordered="false"
upperBound="-1" containment="true">
<eGenericType eTypeParameter="#//Trace/TracedObjectSubtype"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="states" upperBound="-1"
Expand Down Expand Up @@ -207,8 +207,8 @@
eOpposite="#//Step/endingState">
<eGenericType eTypeParameter="#//State/StepSubType"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
eOpposite="#//Value/states">
<eStructuralFeatures xsi:type="ecore:EReference" name="values" ordered="false"
upperBound="-1" eOpposite="#//Value/states">
<eGenericType eTypeParameter="#//State/ValueSubType"/>
</eStructuralFeatures>
</eClassifiers>
Expand Down
4 changes: 2 additions & 2 deletions trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/GenericTrace.genmodel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/fr.inria.diverse.trace.commons.model/src" modelPluginID="fr.inria.diverse.trace.commons.model"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.gemoc.trace.commons.model/src" modelPluginID="org.eclipse.gemoc.trace.commons.model"
modelName="GenericTrace" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore LaunchConfiguration.genmodel#//launchconfiguration"
operationReflection="true" importOrganizing="true">
<foreignModel>GenericTrace.ecore</foreignModel>
<genPackages prefix="Trace" basePackage="fr.inria.diverse.trace.commons.model" disposableProviderFactory="true"
<genPackages prefix="Trace" basePackage="org.eclipse.gemoc.trace.commons.model" disposableProviderFactory="true"
ecorePackage="GenericTrace.ecore#/">
<genDataTypes ecoreDataType="GenericTrace.ecore#//ISerializable"/>
<genClasses ecoreClass="GenericTrace.ecore#//MSEOccurrence">
Expand Down
4 changes: 2 additions & 2 deletions trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/GenericTraceImpl.genmodel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/fr.inria.diverse.trace.commons.model/src" modelPluginID="fr.inria.diverse.trace.commons.model"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.gemoc.trace.commons.model/src" modelPluginID="org.eclipse.gemoc.trace.commons.model"
modelName="GenericTraceImpl" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore GenericTrace.genmodel#//trace LaunchConfiguration.genmodel#//launchconfiguration"
operationReflection="true" importOrganizing="true">
<foreignModel>GenericTraceImpl.ecore</foreignModel>
<genPackages prefix="Generictrace" basePackage="fr.inria.diverse.trace.commons.model"
<genPackages prefix="Generictrace" basePackage="org.eclipse.gemoc.trace.commons.model"
disposableProviderFactory="true" ecorePackage="GenericTraceImpl.ecore#/">
<genDataTypes ecoreDataType="GenericTraceImpl.ecore#//ISerializable"/>
<genClasses ecoreClass="GenericTraceImpl.ecore#//GenericSequentialStep"/>
Expand Down
4 changes: 2 additions & 2 deletions .../commons/plugins/org.eclipse.gemoc.trace.commons.model/model/LaunchConfiguration.genmodel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/fr.inria.diverse.trace.commons.model/src" modelPluginID="fr.inria.diverse.trace.commons.model"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.gemoc.trace.commons.model/src" modelPluginID="org.eclipse.gemoc.trace.commons.model"
modelName="LaunchConfiguration" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
operationReflection="true" importOrganizing="true">
<foreignModel>LaunchConfiguration.ecore</foreignModel>
<genPackages prefix="Launchconfiguration" basePackage="fr.inria.diverse.trace.commons.model"
<genPackages prefix="Launchconfiguration" basePackage="org.eclipse.gemoc.trace.commons.model"
disposableProviderFactory="true" ecorePackage="LaunchConfiguration.ecore#/">
<genDataTypes ecoreDataType="LaunchConfiguration.ecore#//ISerializable"/>
<genClasses ecoreClass="LaunchConfiguration.ecore#//LaunchConfiguration">
Expand Down
2 changes: 1 addition & 1 deletion ...ipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/State.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public interface State<StepSubType extends Step<?>, ValueSubType extends Value<?
* @return the value of the '<em>Values</em>' reference list.
* @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getState_Values()
* @see org.eclipse.gemoc.trace.commons.model.trace.Value#getStates
* @model opposite="states"
* @model opposite="states" ordered="false"
* @generated
*/
EList<ValueSubType> getValues();
Expand Down
2 changes: 1 addition & 1 deletion ...ipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Trace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public interface Trace<StepSubType extends Step<?>, TracedObjectSubtype extends
* <!-- end-user-doc -->
* @return the value of the '<em>Traced Objects</em>' containment reference list.
* @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getTrace_TracedObjects()
* @model containment="true"
* @model containment="true" ordered="false"
* @generated
*/
EList<TracedObjectSubtype> getTracedObjects();
Expand Down
2 changes: 1 addition & 1 deletion ...moc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TracedObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public interface TracedObject<DimensionSubType extends Dimension<?>> extends EOb
* <!-- end-user-doc -->
* @return the value of the '<em>Dimensions</em>' reference list.
* @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getTracedObject_Dimensions()
* @model transient="true" volatile="true"
* @model transient="true" volatile="true" derived="true"
* annotation="http://www.eclipse.org/emf/2002/GenModel get='return getDimensionsInternal();'"
* @generated
*/
Expand Down
6 changes: 3 additions & 3 deletions ....commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TracePackageImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,14 +857,14 @@ public void initializePackageContents() {
g1 = createEGenericType(traceEClass_StepSubType);
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);
g1 = createEGenericType(traceEClass_TracedObjectSubtype);
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);
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);
g1 = createEGenericType(traceEClass_StateSubType);
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);
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);

initEClass(tracedObjectEClass, TracedObject.class, "TracedObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
g1 = createEGenericType(tracedObjectEClass_DimensionSubType);
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);
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);

EOperation op = initEOperation(getTracedObject__GetDimensionsInternal(), null, "getDimensionsInternal", 0, -1, IS_UNIQUE, IS_ORDERED);
g1 = createEGenericType(tracedObjectEClass_DimensionSubType);
Expand All @@ -884,7 +884,7 @@ public void initializePackageContents() {
g1 = createEGenericType(stateEClass_StepSubType);
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);
g1 = createEGenericType(stateEClass_ValueSubType);
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);
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);

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