Skip to content

Commit 3767814

Browse files
d-leroyd-leroy
committed
Working version of generic trace metamodel + multidimensional trace
1 parent 36da05c commit 3767814

File tree

116 files changed

+15218
-305
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+15218
-305
lines changed

‎trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,6 @@
5656
<labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
5757
<color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
5858
</computedStyleDescriptions>
59-
<computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_79v6IOnxEeaI_d9B08ofBw" sourceArrow="FillDiamond" routingStyle="manhattan">
60-
<strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
61-
<centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_79v6IenxEeaI_d9B08ofBw" showIcon="false" labelExpression="service:render">
62-
<labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
63-
</centerLabelStyleDescription>
64-
<endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_79v6IunxEeaI_d9B08ofBw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
65-
<labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
66-
</endLabelStyleDescription>
67-
</computedStyleDescriptions>
6859
<computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_Uqj2gOoQEeaI_d9B08ofBw" sourceArrow="InputArrow" routingStyle="manhattan">
6960
<strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
7061
<beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_Uqj2geoQEeaI_d9B08ofBw" showIcon="false" labelExpression="service:renderEOpposite">
@@ -360,6 +351,10 @@
360351
</children>
361352
<children xmi:type="notation:Node" xmi:id="_eY1Q8-FwEeayiMPtzH5mRw" type="5007"/>
362353
<children xmi:type="notation:Node" xmi:id="_eY1Q9OFwEeayiMPtzH5mRw" type="7004">
354+
<children xmi:type="notation:Node" xmi:id="_mcbPEOxUEeatZM_26E8BTg" type="3010" element="_maofUOxUEeatZM_26E8BTg">
355+
<styles xmi:type="notation:FontStyle" xmi:id="_mcbPEexUEeatZM_26E8BTg" fontName="Ubuntu" fontHeight="8"/>
356+
<layoutConstraint xmi:type="notation:Location" xmi:id="_mcbPEuxUEeatZM_26E8BTg"/>
357+
</children>
363358
<styles xmi:type="notation:SortingStyle" xmi:id="_eY1Q9eFwEeayiMPtzH5mRw"/>
364359
<styles xmi:type="notation:FilteringStyle" xmi:id="_eY1Q9uFwEeayiMPtzH5mRw"/>
365360
</children>
@@ -1373,12 +1368,12 @@
13731368
</ownedStyle>
13741369
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
13751370
</ownedDiagramElements>
1376-
<ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_ZUl7AOFwEeayiMPtzH5mRw" name="[0..*] /tracedObjects" sourceNode="_WfAx0OFsEeayiMPtzH5mRw" targetNode="_IxyQAOFwEeayiMPtzH5mRw">
1371+
<ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_ZUl7AOFwEeayiMPtzH5mRw" name="[0..*] tracedObjects" sourceNode="_WfAx0OFsEeayiMPtzH5mRw" targetNode="_IxyQAOFwEeayiMPtzH5mRw">
13771372
<target xmi:type="ecore:EReference" href="GenericTrace.ecore#//Trace/tracedObjects"/>
13781373
<semanticElements xmi:type="ecore:EReference" href="GenericTrace.ecore#//Trace/tracedObjects"/>
1379-
<ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_79xIQOnxEeaI_d9B08ofBw" description="_79v6IOnxEeaI_d9B08ofBw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="114,159,207">
1380-
<centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_79xIQenxEeaI_d9B08ofBw" showIcon="false" labelColor="39,76,114"/>
1381-
<endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_79xIQunxEeaI_d9B08ofBw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
1374+
<ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_mbjsYOxUEeatZM_26E8BTg" description="_WgeKYOFsEeayiMPtzH5mRw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
1375+
<centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_mbjsYexUEeatZM_26E8BTg" showIcon="false"/>
1376+
<endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_mbjsYuxUEeatZM_26E8BTg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
13821377
</ownedStyle>
13831378
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
13841379
</ownedDiagramElements>
@@ -1404,6 +1399,14 @@
14041399
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
14051400
</ownedStyle>
14061401
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
1402+
<ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_maofUOxUEeatZM_26E8BTg" name="getDimensionsInternal() : DimensionSubType" tooltipText="getDimensionsInternal() : DimensionSubType">
1403+
<target xmi:type="ecore:EOperation" href="GenericTrace.ecore#//TracedObject/getDimensionsInternal"/>
1404+
<semanticElements xmi:type="ecore:EOperation" href="GenericTrace.ecore#//TracedObject/getDimensionsInternal"/>
1405+
<ownedStyle xmi:type="diagram:BundledImage" xmi:id="_maswwOxUEeatZM_26E8BTg" labelAlignment="LEFT">
1406+
<description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']/@style"/>
1407+
</ownedStyle>
1408+
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
1409+
</ownedElements>
14071410
</ownedDiagramElements>
14081411
<ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_oPqzMOFwEeayiMPtzH5mRw" name="Dimension" tooltipText="" outgoingEdges="_9xCp8OFwEeayiMPtzH5mRw" width="12" height="10">
14091412
<target xmi:type="ecore:EClass" href="GenericTrace.ecore#//Dimension"/>
@@ -1451,12 +1454,12 @@
14511454
</ownedStyle>
14521455
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
14531456
</ownedDiagramElements>
1454-
<ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_vWnAsOFwEeayiMPtzH5mRw" name="[0..*] /dimensions" sourceNode="_eX0kUOFwEeayiMPtzH5mRw" targetNode="_sf-KwOFwEeayiMPtzH5mRw">
1457+
<ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_vWnAsOFwEeayiMPtzH5mRw" name="[0..*] dimensions" sourceNode="_eX0kUOFwEeayiMPtzH5mRw" targetNode="_sf-KwOFwEeayiMPtzH5mRw">
14551458
<target xmi:type="ecore:EReference" href="GenericTrace.ecore#//TracedObject/dimensions"/>
14561459
<semanticElements xmi:type="ecore:EReference" href="GenericTrace.ecore#//TracedObject/dimensions"/>
1457-
<ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_79zkgOnxEeaI_d9B08ofBw" description="_79v6IOnxEeaI_d9B08ofBw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="114,159,207">
1458-
<centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_79zkgenxEeaI_d9B08ofBw" showIcon="false" labelColor="39,76,114"/>
1459-
<endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_79zkgunxEeaI_d9B08ofBw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
1460+
<ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_mblhkOxUEeatZM_26E8BTg" description="_WgeKYOFsEeayiMPtzH5mRw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
1461+
<centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_mblhkexUEeatZM_26E8BTg" showIcon="false"/>
1462+
<endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_mblhkuxUEeatZM_26E8BTg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
14601463
</ownedStyle>
14611464
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
14621465
</ownedDiagramElements>

‎trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,17 @@
151151
<eTypeArguments/>
152152
</eBounds>
153153
</eTypeParameters>
154+
<eOperations name="getDimensionsInternal" upperBound="-1">
155+
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
156+
<details key="body" value="// Default implementation, returning empty list.&#xA;final EList&lt;DimensionSubType> result = new org.eclipse.emf.ecore.util.BasicInternalEList&lt;DimensionSubType>(Object.class);&#xA;return result;"/>
157+
</eAnnotations>
158+
<eGenericType eTypeParameter="#//TracedObject/DimensionSubType"/>
159+
</eOperations>
154160
<eStructuralFeatures xsi:type="ecore:EReference" name="dimensions" upperBound="-1"
155-
containment="true">
161+
volatile="true" transient="true">
162+
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
163+
<details key="get" value="return getDimensionsInternal();"/>
164+
</eAnnotations>
156165
<eGenericType eTypeParameter="#//TracedObject/DimensionSubType"/>
157166
</eStructuralFeatures>
158167
</eClassifiers>

0 commit comments

Comments
 (0)