Generated model definition files
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/ecore-definitions.zip b/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/ecore-definitions.zip
index 548c597..831500e 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/ecore-definitions.zip
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/ecore-definitions.zip
Binary files differ
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/ecore/amalthea.ecore b/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/ecore/amalthea.ecore
index 7560ab4..14325b0 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/ecore/amalthea.ecore
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/ecore/amalthea.ecore
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://app4mc.eclipse.org/amalthea/0.9.9" nsPrefix="am">
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://app4mc.eclipse.org/amalthea/1.0.0" nsPrefix="am">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="*
*******************************************************************************
Copyright (c) 2015-2020 Robert Bosch GmbH and others.

This program and the accompanying materials are made
available under the terms of the Eclipse Public License 2.0
which is available at https://www.eclipse.org/legal/epl-2.0/

SPDX-License-Identifier: EPL-2.0
*******************************************************************************"/>
<details key="modelName" value="Amalthea"/>
@@ -28,7 +28,7 @@
eType="ecore:EDataType ecore.ecore#//EString"
changeable="false" volatile="true" transient="true" derived="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="get" value="return "0.9.9";"/>
+ <details key="get" value="return "1.0.0";"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="commonElements" eType="#//CommonElements"
@@ -53,8 +53,6 @@
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="configModel" eType="#//ConfigModel"
containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="measurementModel" eType="#//MeasurementModel"
- containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CommonElements" eSuperTypes="#//BaseObject">
<eStructuralFeatures xsi:type="ecore:EReference" name="tags" upperBound="-1" eType="#//Tag"
@@ -1934,7 +1932,6 @@
</eAnnotations>
<eLiterals name="_all_"/>
<eLiterals name="activate"/>
- <eLiterals name="deadline"/>
<eLiterals name="start"/>
<eLiterals name="resume"/>
<eLiterals name="preempt"/>
@@ -4340,28 +4337,4 @@
<eLiterals name="A"/>
<eLiterals name="QM"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="MeasurementModel" eSuperTypes="#//BaseObject">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="@deprecated (0.9.9) use the Amalthea Trace Database (ATDB) instead."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="measurements" upperBound="-1"
- eType="#//Measurement" containment="true" resolveProxies="false"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Measurement" abstract="true" eSuperTypes="#//BaseObject">
- <eStructuralFeatures xsi:type="ecore:EReference" name="runtimes" upperBound="-1"
- eType="#//Time" containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="runtimeDeviation" eType="#//ITimeDeviation"
- containment="true" resolveProxies="false"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="EventChainMeasurement" eSuperTypes="#//Measurement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="eventChain" lowerBound="1"
- eType="#//EventChain"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="TaskMeasurement" eSuperTypes="#//Measurement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="task" lowerBound="1" eType="#//Task"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="RunnableMeasurement" eSuperTypes="#//Measurement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="runnable" lowerBound="1"
- eType="#//Runnable"/>
- </eClassifiers>
</ecore:EPackage>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/ecore/amalthea.genmodel b/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/ecore/amalthea.genmodel
index aec4f60..39ac1bb 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/ecore/amalthea.genmodel
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/ecore/amalthea.genmodel
@@ -216,7 +216,6 @@
<genEnums typeSafeEnumCompatible="false" ecoreEnum="amalthea.ecore#//ProcessEventType">
<genEnumLiterals ecoreEnumLiteral="amalthea.ecore#//ProcessEventType/_all_"/>
<genEnumLiterals ecoreEnumLiteral="amalthea.ecore#//ProcessEventType/activate"/>
- <genEnumLiterals ecoreEnumLiteral="amalthea.ecore#//ProcessEventType/deadline"/>
<genEnumLiterals ecoreEnumLiteral="amalthea.ecore#//ProcessEventType/start"/>
<genEnumLiterals ecoreEnumLiteral="amalthea.ecore#//ProcessEventType/resume"/>
<genEnumLiterals ecoreEnumLiteral="amalthea.ecore#//ProcessEventType/preempt"/>
@@ -487,7 +486,7 @@
<genDataTypes ecoreDataType="amalthea.ecore#//NonNegativeDouble"/>
<genClasses ecoreClass="amalthea.ecore#//Amalthea">
<genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute amalthea.ecore#//Amalthea/version"
- get="return "0.9.9";"/>
+ get="return "1.0.0";"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Amalthea/commonElements"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Amalthea/swModel"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Amalthea/hwModel"/>
@@ -499,7 +498,6 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Amalthea/mappingModel"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Amalthea/componentsModel"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Amalthea/configModel"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Amalthea/measurementModel"/>
</genClasses>
<genClasses ecoreClass="amalthea.ecore#//CommonElements">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//CommonElements/tags"/>
@@ -2205,22 +2203,6 @@
<genClasses ecoreClass="amalthea.ecore#//RunEntityCallStatistic">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//RunEntityCallStatistic/statistic"/>
</genClasses>
- <genClasses ecoreClass="amalthea.ecore#//MeasurementModel">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//MeasurementModel/measurements"/>
- </genClasses>
- <genClasses image="false" ecoreClass="amalthea.ecore#//Measurement">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Measurement/runtimes"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Measurement/runtimeDeviation"/>
- </genClasses>
- <genClasses ecoreClass="amalthea.ecore#//EventChainMeasurement">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference amalthea.ecore#//EventChainMeasurement/eventChain"/>
- </genClasses>
- <genClasses ecoreClass="amalthea.ecore#//TaskMeasurement">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference amalthea.ecore#//TaskMeasurement/task"/>
- </genClasses>
- <genClasses ecoreClass="amalthea.ecore#//RunnableMeasurement">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference amalthea.ecore#//RunnableMeasurement/runnable"/>
- </genClasses>
</genPackages>
<genPackages prefix="Ecore" basePackage="org.eclipse.emf" disposableProviderFactory="true"
multipleEditorPages="false" contentTypeIdentifier="org.eclipse.emf.ecore" ecorePackage="ecore.ecore#/">
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xcore/amalthea.xcore.bak b/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xcore/amalthea.xcore.bak
index 7afc4b4..be71d10 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xcore/amalthea.xcore.bak
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xcore/amalthea.xcore.bak
@@ -71,7 +71,6 @@
contains MappingModel mappingModel
contains ComponentsModel componentsModel
contains ConfigModel configModel
- contains MeasurementModel measurementModel
}
@@ -1927,7 +1926,6 @@
{
_all_
activate
- deadline
start
resume
preempt
@@ -4306,41 +4304,3 @@
A
QM
}
-
-
-// ===============================================================================
-// ===============================================================================
-//
-// Measurement Model
-//
-// ===============================================================================
-// ===============================================================================
-
-
-@GenModel(documentation="@deprecated (0.9.9) use the Amalthea Trace Database (ATDB) instead.")
-class MeasurementModel extends BaseObject
-{
- contains Measurement[] measurements
-}
-
-abstract class Measurement extends BaseObject
-{
- contains Time[] runtimes
- contains ITimeDeviation runtimeDeviation
-}
-
-class EventChainMeasurement extends Measurement
-{
- refers EventChain[1] eventChain
-}
-
-class TaskMeasurement extends Measurement
-{
- refers Task[1] task
-}
-
-class RunnableMeasurement extends Measurement
-{
- refers Runnable[1] runnable
-}
-
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xml-definitions.zip b/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xml-definitions.zip
index 4bf4a88..8027931 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xml-definitions.zip
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xml-definitions.zip
Binary files differ
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xml-schema-xmi/amalthea-xmi.xsd b/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xml-schema-xmi/amalthea-xmi.xsd
index 7d55879..094595e 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xml-schema-xmi/amalthea-xmi.xsd
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xml-schema-xmi/amalthea-xmi.xsd
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns:am="http://app4mc.eclipse.org/amalthea/0.9.9" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://app4mc.eclipse.org/amalthea/0.9.9">
+<xsd:schema xmlns:am="http://app4mc.eclipse.org/amalthea/1.0.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://app4mc.eclipse.org/amalthea/1.0.0">
<xsd:annotation>
<xsd:documentation>*
*******************************************************************************
@@ -264,7 +264,6 @@
<xsd:restriction base="xsd:NCName">
<xsd:enumeration value="_all_"/>
<xsd:enumeration value="activate"/>
- <xsd:enumeration value="deadline"/>
<xsd:enumeration value="start"/>
<xsd:enumeration value="resume"/>
<xsd:enumeration value="preempt"/>
@@ -686,7 +685,6 @@
<xsd:element name="mappingModel" type="am:MappingModel"/>
<xsd:element name="componentsModel" type="am:ComponentsModel"/>
<xsd:element name="configModel" type="am:ConfigModel"/>
- <xsd:element name="measurementModel" type="am:MeasurementModel"/>
</xsd:choice>
</xsd:extension>
</xsd:complexContent>
@@ -6312,65 +6310,4 @@
</xsd:complexContent>
</xsd:complexType>
<xsd:element name="RunEntityCallStatistic" type="am:RunEntityCallStatistic"/>
- <xsd:complexType name="MeasurementModel">
- <xsd:annotation>
- <xsd:documentation>@deprecated (0.9.9) use the Amalthea Trace Database (ATDB) instead.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexContent>
- <xsd:extension base="am:BaseObject">
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element name="measurements" type="am:Measurement"/>
- </xsd:choice>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:element name="MeasurementModel" type="am:MeasurementModel">
- <xsd:annotation>
- <xsd:documentation>@deprecated (0.9.9) use the Amalthea Trace Database (ATDB) instead.</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:complexType abstract="true" name="Measurement">
- <xsd:complexContent>
- <xsd:extension base="am:BaseObject">
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element name="runtimes" type="am:Time"/>
- <xsd:element name="runtimeDeviation" type="am:ITimeDeviation"/>
- </xsd:choice>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:element name="Measurement" type="am:Measurement"/>
- <xsd:complexType name="EventChainMeasurement">
- <xsd:complexContent>
- <xsd:extension base="am:Measurement">
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element name="eventChain" type="am:EventChain"/>
- </xsd:choice>
- <xsd:attribute name="eventChain" type="xsd:string"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:element name="EventChainMeasurement" type="am:EventChainMeasurement"/>
- <xsd:complexType name="TaskMeasurement">
- <xsd:complexContent>
- <xsd:extension base="am:Measurement">
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element name="task" type="am:Task"/>
- </xsd:choice>
- <xsd:attribute name="task" type="xsd:string"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:element name="TaskMeasurement" type="am:TaskMeasurement"/>
- <xsd:complexType name="RunnableMeasurement">
- <xsd:complexContent>
- <xsd:extension base="am:Measurement">
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element name="runnable" type="am:Runnable"/>
- </xsd:choice>
- <xsd:attribute name="runnable" type="xsd:string"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:element name="RunnableMeasurement" type="am:RunnableMeasurement"/>
</xsd:schema>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xml-schema/amalthea.xsd b/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xml-schema/amalthea.xsd
index edd795f..b9d196c 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xml-schema/amalthea.xsd
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xml-schema/amalthea.xsd
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns:am="http://app4mc.eclipse.org/amalthea/0.9.9" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ecore:nsPrefix="am" ecore:package="org.eclipse.app4mc.amalthea.model" targetNamespace="http://app4mc.eclipse.org/amalthea/0.9.9">
+<xsd:schema xmlns:am="http://app4mc.eclipse.org/amalthea/1.0.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ecore:nsPrefix="am" ecore:package="org.eclipse.app4mc.amalthea.model" targetNamespace="http://app4mc.eclipse.org/amalthea/1.0.0">
<xsd:import namespace="http://www.eclipse.org/emf/2002/Ecore" schemaLocation="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.xsd"/>
<xsd:annotation>
<xsd:documentation>*
@@ -385,11 +385,6 @@
<xsd:element ecore:ignore="true" name="CustomActivation" type="am:CustomActivation"/>
<xsd:element ecore:ignore="true" name="LabelAccessStatistic" type="am:LabelAccessStatistic"/>
<xsd:element ecore:ignore="true" name="RunEntityCallStatistic" type="am:RunEntityCallStatistic"/>
- <xsd:element ecore:ignore="true" name="MeasurementModel" type="am:MeasurementModel"/>
- <xsd:element ecore:ignore="true" name="Measurement" type="am:Measurement"/>
- <xsd:element ecore:ignore="true" name="EventChainMeasurement" type="am:EventChainMeasurement"/>
- <xsd:element ecore:ignore="true" name="TaskMeasurement" type="am:TaskMeasurement"/>
- <xsd:element ecore:ignore="true" name="RunnableMeasurement" type="am:RunnableMeasurement"/>
<xsd:complexType name="Amalthea">
<xsd:complexContent>
<xsd:extension base="am:BaseObject">
@@ -405,7 +400,6 @@
<xsd:element minOccurs="0" name="mappingModel" type="am:MappingModel"/>
<xsd:element minOccurs="0" name="componentsModel" type="am:ComponentsModel"/>
<xsd:element minOccurs="0" name="configModel" type="am:ConfigModel"/>
- <xsd:element minOccurs="0" name="measurementModel" type="am:MeasurementModel"/>
</xsd:sequence>
<xsd:attribute ecore:changeable="false" ecore:derived="true" ecore:transient="true" ecore:volatile="true" name="version" type="ecore:EString"/>
</xsd:extension>
@@ -3036,7 +3030,6 @@
<xsd:restriction base="xsd:string">
<xsd:enumeration value="_all_"/>
<xsd:enumeration ecore:value="0" value="activate"/>
- <xsd:enumeration ecore:value="0" value="deadline"/>
<xsd:enumeration ecore:value="0" value="start"/>
<xsd:enumeration ecore:value="0" value="resume"/>
<xsd:enumeration ecore:value="0" value="preempt"/>
@@ -6510,47 +6503,4 @@
<xsd:enumeration ecore:value="0" value="QM"/>
</xsd:restriction>
</xsd:simpleType>
- <xsd:complexType name="MeasurementModel">
- <xsd:annotation>
- <xsd:documentation>@deprecated (0.9.9) use the Amalthea Trace Database (ATDB) instead.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexContent>
- <xsd:extension base="am:BaseObject">
- <xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="measurements" type="am:Measurement"/>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType abstract="true" name="Measurement">
- <xsd:complexContent>
- <xsd:extension base="am:BaseObject">
- <xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="runtimes" type="am:Time"/>
- <xsd:element minOccurs="0" name="runtimeDeviation" type="am:ITimeDeviation"/>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="EventChainMeasurement">
- <xsd:complexContent>
- <xsd:extension base="am:Measurement">
- <xsd:attribute ecore:reference="am:EventChain" name="eventChain" type="xsd:anyURI" use="required"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="TaskMeasurement">
- <xsd:complexContent>
- <xsd:extension base="am:Measurement">
- <xsd:attribute ecore:reference="am:Task" name="task" type="xsd:anyURI" use="required"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="RunnableMeasurement">
- <xsd:complexContent>
- <xsd:extension base="am:Measurement">
- <xsd:attribute ecore:reference="am:Runnable" name="runnable" type="xsd:anyURI" use="required"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
</xsd:schema>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xml/amalthea.xml b/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xml/amalthea.xml
index dad911b..fa7382c 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xml/amalthea.xml
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-model/xml/amalthea.xml
@@ -53,8 +53,6 @@
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="configModel" eType="#//ConfigModel"
containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="measurementModel" eType="#//MeasurementModel"
- containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CommonElements" eSuperTypes="#//BaseObject">
<eStructuralFeatures xsi:type="ecore:EReference" name="tags" upperBound="-1" eType="#//Tag"
@@ -1916,7 +1914,6 @@
</eAnnotations>
<eLiterals name="_all_"/>
<eLiterals name="activate"/>
- <eLiterals name="deadline"/>
<eLiterals name="start"/>
<eLiterals name="resume"/>
<eLiterals name="preempt"/>
@@ -4293,28 +4290,4 @@
<eLiterals name="A"/>
<eLiterals name="QM"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="MeasurementModel" eSuperTypes="#//BaseObject">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="@deprecated (0.9.9) use the Amalthea Trace Database (ATDB) instead."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="measurements" upperBound="-1"
- eType="#//Measurement" containment="true" resolveProxies="false"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Measurement" abstract="true" eSuperTypes="#//BaseObject">
- <eStructuralFeatures xsi:type="ecore:EReference" name="runtimes" upperBound="-1"
- eType="#//Time" containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="runtimeDeviation" eType="#//ITimeDeviation"
- containment="true" resolveProxies="false"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="EventChainMeasurement" eSuperTypes="#//Measurement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="eventChain" lowerBound="1"
- eType="#//EventChain"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="TaskMeasurement" eSuperTypes="#//Measurement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="task" lowerBound="1" eType="#//Task"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="RunnableMeasurement" eSuperTypes="#//Measurement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="runnable" lowerBound="1"
- eType="#//Runnable"/>
- </eClassifiers>
</ecore:EPackage>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model/model-gen/ecore/amalthea.ecore b/plugins/org.eclipse.app4mc.amalthea.model/model-gen/ecore/amalthea.ecore
index 7560ab4..14325b0 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model/model-gen/ecore/amalthea.ecore
+++ b/plugins/org.eclipse.app4mc.amalthea.model/model-gen/ecore/amalthea.ecore
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://app4mc.eclipse.org/amalthea/0.9.9" nsPrefix="am">
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://app4mc.eclipse.org/amalthea/1.0.0" nsPrefix="am">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="*
*******************************************************************************
Copyright (c) 2015-2020 Robert Bosch GmbH and others.

This program and the accompanying materials are made
available under the terms of the Eclipse Public License 2.0
which is available at https://www.eclipse.org/legal/epl-2.0/

SPDX-License-Identifier: EPL-2.0
*******************************************************************************"/>
<details key="modelName" value="Amalthea"/>
@@ -28,7 +28,7 @@
eType="ecore:EDataType ecore.ecore#//EString"
changeable="false" volatile="true" transient="true" derived="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="get" value="return "0.9.9";"/>
+ <details key="get" value="return "1.0.0";"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="commonElements" eType="#//CommonElements"
@@ -53,8 +53,6 @@
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="configModel" eType="#//ConfigModel"
containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="measurementModel" eType="#//MeasurementModel"
- containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CommonElements" eSuperTypes="#//BaseObject">
<eStructuralFeatures xsi:type="ecore:EReference" name="tags" upperBound="-1" eType="#//Tag"
@@ -1934,7 +1932,6 @@
</eAnnotations>
<eLiterals name="_all_"/>
<eLiterals name="activate"/>
- <eLiterals name="deadline"/>
<eLiterals name="start"/>
<eLiterals name="resume"/>
<eLiterals name="preempt"/>
@@ -4340,28 +4337,4 @@
<eLiterals name="A"/>
<eLiterals name="QM"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="MeasurementModel" eSuperTypes="#//BaseObject">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="@deprecated (0.9.9) use the Amalthea Trace Database (ATDB) instead."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="measurements" upperBound="-1"
- eType="#//Measurement" containment="true" resolveProxies="false"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Measurement" abstract="true" eSuperTypes="#//BaseObject">
- <eStructuralFeatures xsi:type="ecore:EReference" name="runtimes" upperBound="-1"
- eType="#//Time" containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="runtimeDeviation" eType="#//ITimeDeviation"
- containment="true" resolveProxies="false"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="EventChainMeasurement" eSuperTypes="#//Measurement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="eventChain" lowerBound="1"
- eType="#//EventChain"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="TaskMeasurement" eSuperTypes="#//Measurement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="task" lowerBound="1" eType="#//Task"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="RunnableMeasurement" eSuperTypes="#//Measurement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="runnable" lowerBound="1"
- eType="#//Runnable"/>
- </eClassifiers>
</ecore:EPackage>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model/model-gen/ecore/amalthea.genmodel b/plugins/org.eclipse.app4mc.amalthea.model/model-gen/ecore/amalthea.genmodel
index aec4f60..39ac1bb 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model/model-gen/ecore/amalthea.genmodel
+++ b/plugins/org.eclipse.app4mc.amalthea.model/model-gen/ecore/amalthea.genmodel
@@ -216,7 +216,6 @@
<genEnums typeSafeEnumCompatible="false" ecoreEnum="amalthea.ecore#//ProcessEventType">
<genEnumLiterals ecoreEnumLiteral="amalthea.ecore#//ProcessEventType/_all_"/>
<genEnumLiterals ecoreEnumLiteral="amalthea.ecore#//ProcessEventType/activate"/>
- <genEnumLiterals ecoreEnumLiteral="amalthea.ecore#//ProcessEventType/deadline"/>
<genEnumLiterals ecoreEnumLiteral="amalthea.ecore#//ProcessEventType/start"/>
<genEnumLiterals ecoreEnumLiteral="amalthea.ecore#//ProcessEventType/resume"/>
<genEnumLiterals ecoreEnumLiteral="amalthea.ecore#//ProcessEventType/preempt"/>
@@ -487,7 +486,7 @@
<genDataTypes ecoreDataType="amalthea.ecore#//NonNegativeDouble"/>
<genClasses ecoreClass="amalthea.ecore#//Amalthea">
<genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute amalthea.ecore#//Amalthea/version"
- get="return "0.9.9";"/>
+ get="return "1.0.0";"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Amalthea/commonElements"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Amalthea/swModel"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Amalthea/hwModel"/>
@@ -499,7 +498,6 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Amalthea/mappingModel"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Amalthea/componentsModel"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Amalthea/configModel"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Amalthea/measurementModel"/>
</genClasses>
<genClasses ecoreClass="amalthea.ecore#//CommonElements">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//CommonElements/tags"/>
@@ -2205,22 +2203,6 @@
<genClasses ecoreClass="amalthea.ecore#//RunEntityCallStatistic">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//RunEntityCallStatistic/statistic"/>
</genClasses>
- <genClasses ecoreClass="amalthea.ecore#//MeasurementModel">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//MeasurementModel/measurements"/>
- </genClasses>
- <genClasses image="false" ecoreClass="amalthea.ecore#//Measurement">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Measurement/runtimes"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference amalthea.ecore#//Measurement/runtimeDeviation"/>
- </genClasses>
- <genClasses ecoreClass="amalthea.ecore#//EventChainMeasurement">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference amalthea.ecore#//EventChainMeasurement/eventChain"/>
- </genClasses>
- <genClasses ecoreClass="amalthea.ecore#//TaskMeasurement">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference amalthea.ecore#//TaskMeasurement/task"/>
- </genClasses>
- <genClasses ecoreClass="amalthea.ecore#//RunnableMeasurement">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference amalthea.ecore#//RunnableMeasurement/runnable"/>
- </genClasses>
</genPackages>
<genPackages prefix="Ecore" basePackage="org.eclipse.emf" disposableProviderFactory="true"
multipleEditorPages="false" contentTypeIdentifier="org.eclipse.emf.ecore" ecorePackage="ecore.ecore#/">
diff --git a/plugins/org.eclipse.app4mc.amalthea.model/model-gen/xml-schema-xmi/amalthea-xmi.xsd b/plugins/org.eclipse.app4mc.amalthea.model/model-gen/xml-schema-xmi/amalthea-xmi.xsd
index 7d55879..094595e 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model/model-gen/xml-schema-xmi/amalthea-xmi.xsd
+++ b/plugins/org.eclipse.app4mc.amalthea.model/model-gen/xml-schema-xmi/amalthea-xmi.xsd
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns:am="http://app4mc.eclipse.org/amalthea/0.9.9" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://app4mc.eclipse.org/amalthea/0.9.9">
+<xsd:schema xmlns:am="http://app4mc.eclipse.org/amalthea/1.0.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://app4mc.eclipse.org/amalthea/1.0.0">
<xsd:annotation>
<xsd:documentation>*
*******************************************************************************
@@ -264,7 +264,6 @@
<xsd:restriction base="xsd:NCName">
<xsd:enumeration value="_all_"/>
<xsd:enumeration value="activate"/>
- <xsd:enumeration value="deadline"/>
<xsd:enumeration value="start"/>
<xsd:enumeration value="resume"/>
<xsd:enumeration value="preempt"/>
@@ -686,7 +685,6 @@
<xsd:element name="mappingModel" type="am:MappingModel"/>
<xsd:element name="componentsModel" type="am:ComponentsModel"/>
<xsd:element name="configModel" type="am:ConfigModel"/>
- <xsd:element name="measurementModel" type="am:MeasurementModel"/>
</xsd:choice>
</xsd:extension>
</xsd:complexContent>
@@ -6312,65 +6310,4 @@
</xsd:complexContent>
</xsd:complexType>
<xsd:element name="RunEntityCallStatistic" type="am:RunEntityCallStatistic"/>
- <xsd:complexType name="MeasurementModel">
- <xsd:annotation>
- <xsd:documentation>@deprecated (0.9.9) use the Amalthea Trace Database (ATDB) instead.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexContent>
- <xsd:extension base="am:BaseObject">
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element name="measurements" type="am:Measurement"/>
- </xsd:choice>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:element name="MeasurementModel" type="am:MeasurementModel">
- <xsd:annotation>
- <xsd:documentation>@deprecated (0.9.9) use the Amalthea Trace Database (ATDB) instead.</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:complexType abstract="true" name="Measurement">
- <xsd:complexContent>
- <xsd:extension base="am:BaseObject">
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element name="runtimes" type="am:Time"/>
- <xsd:element name="runtimeDeviation" type="am:ITimeDeviation"/>
- </xsd:choice>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:element name="Measurement" type="am:Measurement"/>
- <xsd:complexType name="EventChainMeasurement">
- <xsd:complexContent>
- <xsd:extension base="am:Measurement">
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element name="eventChain" type="am:EventChain"/>
- </xsd:choice>
- <xsd:attribute name="eventChain" type="xsd:string"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:element name="EventChainMeasurement" type="am:EventChainMeasurement"/>
- <xsd:complexType name="TaskMeasurement">
- <xsd:complexContent>
- <xsd:extension base="am:Measurement">
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element name="task" type="am:Task"/>
- </xsd:choice>
- <xsd:attribute name="task" type="xsd:string"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:element name="TaskMeasurement" type="am:TaskMeasurement"/>
- <xsd:complexType name="RunnableMeasurement">
- <xsd:complexContent>
- <xsd:extension base="am:Measurement">
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element name="runnable" type="am:Runnable"/>
- </xsd:choice>
- <xsd:attribute name="runnable" type="xsd:string"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:element name="RunnableMeasurement" type="am:RunnableMeasurement"/>
</xsd:schema>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model/model-gen/xml-schema/amalthea.xsd b/plugins/org.eclipse.app4mc.amalthea.model/model-gen/xml-schema/amalthea.xsd
index edd795f..b9d196c 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model/model-gen/xml-schema/amalthea.xsd
+++ b/plugins/org.eclipse.app4mc.amalthea.model/model-gen/xml-schema/amalthea.xsd
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns:am="http://app4mc.eclipse.org/amalthea/0.9.9" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ecore:nsPrefix="am" ecore:package="org.eclipse.app4mc.amalthea.model" targetNamespace="http://app4mc.eclipse.org/amalthea/0.9.9">
+<xsd:schema xmlns:am="http://app4mc.eclipse.org/amalthea/1.0.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ecore:nsPrefix="am" ecore:package="org.eclipse.app4mc.amalthea.model" targetNamespace="http://app4mc.eclipse.org/amalthea/1.0.0">
<xsd:import namespace="http://www.eclipse.org/emf/2002/Ecore" schemaLocation="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.xsd"/>
<xsd:annotation>
<xsd:documentation>*
@@ -385,11 +385,6 @@
<xsd:element ecore:ignore="true" name="CustomActivation" type="am:CustomActivation"/>
<xsd:element ecore:ignore="true" name="LabelAccessStatistic" type="am:LabelAccessStatistic"/>
<xsd:element ecore:ignore="true" name="RunEntityCallStatistic" type="am:RunEntityCallStatistic"/>
- <xsd:element ecore:ignore="true" name="MeasurementModel" type="am:MeasurementModel"/>
- <xsd:element ecore:ignore="true" name="Measurement" type="am:Measurement"/>
- <xsd:element ecore:ignore="true" name="EventChainMeasurement" type="am:EventChainMeasurement"/>
- <xsd:element ecore:ignore="true" name="TaskMeasurement" type="am:TaskMeasurement"/>
- <xsd:element ecore:ignore="true" name="RunnableMeasurement" type="am:RunnableMeasurement"/>
<xsd:complexType name="Amalthea">
<xsd:complexContent>
<xsd:extension base="am:BaseObject">
@@ -405,7 +400,6 @@
<xsd:element minOccurs="0" name="mappingModel" type="am:MappingModel"/>
<xsd:element minOccurs="0" name="componentsModel" type="am:ComponentsModel"/>
<xsd:element minOccurs="0" name="configModel" type="am:ConfigModel"/>
- <xsd:element minOccurs="0" name="measurementModel" type="am:MeasurementModel"/>
</xsd:sequence>
<xsd:attribute ecore:changeable="false" ecore:derived="true" ecore:transient="true" ecore:volatile="true" name="version" type="ecore:EString"/>
</xsd:extension>
@@ -3036,7 +3030,6 @@
<xsd:restriction base="xsd:string">
<xsd:enumeration value="_all_"/>
<xsd:enumeration ecore:value="0" value="activate"/>
- <xsd:enumeration ecore:value="0" value="deadline"/>
<xsd:enumeration ecore:value="0" value="start"/>
<xsd:enumeration ecore:value="0" value="resume"/>
<xsd:enumeration ecore:value="0" value="preempt"/>
@@ -6510,47 +6503,4 @@
<xsd:enumeration ecore:value="0" value="QM"/>
</xsd:restriction>
</xsd:simpleType>
- <xsd:complexType name="MeasurementModel">
- <xsd:annotation>
- <xsd:documentation>@deprecated (0.9.9) use the Amalthea Trace Database (ATDB) instead.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexContent>
- <xsd:extension base="am:BaseObject">
- <xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="measurements" type="am:Measurement"/>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType abstract="true" name="Measurement">
- <xsd:complexContent>
- <xsd:extension base="am:BaseObject">
- <xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="runtimes" type="am:Time"/>
- <xsd:element minOccurs="0" name="runtimeDeviation" type="am:ITimeDeviation"/>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="EventChainMeasurement">
- <xsd:complexContent>
- <xsd:extension base="am:Measurement">
- <xsd:attribute ecore:reference="am:EventChain" name="eventChain" type="xsd:anyURI" use="required"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="TaskMeasurement">
- <xsd:complexContent>
- <xsd:extension base="am:Measurement">
- <xsd:attribute ecore:reference="am:Task" name="task" type="xsd:anyURI" use="required"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="RunnableMeasurement">
- <xsd:complexContent>
- <xsd:extension base="am:Measurement">
- <xsd:attribute ecore:reference="am:Runnable" name="runnable" type="xsd:anyURI" use="required"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
</xsd:schema>
diff --git a/plugins/org.eclipse.app4mc.help/build-help-all.ant b/plugins/org.eclipse.app4mc.help/build-help-all.ant
index bd6aecd..25b6e88 100644
--- a/plugins/org.eclipse.app4mc.help/build-help-all.ant
+++ b/plugins/org.eclipse.app4mc.help/build-help-all.ant
@@ -28,6 +28,7 @@
<ant dir="../org.eclipse.app4mc.amalthea.import.help/" antfile="build-help.ant" />
<ant dir="../org.eclipse.app4mc.validation.help/" antfile="build-help.ant" />
+ <ant dir="../org.eclipse.app4mc.visualization.help/" antfile="build-help.ant" />
</target>
</project>
