Commit 859e8a13 authored by Alexander Diewald's avatar Alexander Diewald
Browse files

Resolve SafetyLevel-related test failures



Issue-Ref: 3859
Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
parent d1304d09
<?xml version="1.0" encoding="UTF-8"?>
<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-allocation="http://www.fortiss.org/af3/allocation" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-annotation="http://www.fortiss.org/af3/platform/annotation" xmlns:org-fortiss-af3-platform-generic="http://www.fortiss.org/af3/platform/generic" xmlns:org-fortiss-af3-platform-hierarchic-annotation="http://www.fortiss.org/af3/platform/hierarchic/annotation" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-safety-annotation="http://www.fortiss.org/af3/safety/annotation" xmlns:org-fortiss-af3-task="http://www.fortiss.org/af3/task" xmlns:org-fortiss-af3-task-allocation="http://www.fortiss.org/af3/task/allocation" xmlns:org-fortiss-af3-task-annotation="http://www.fortiss.org/af3/task/annotation" xmlns:org-fortiss-af3-task-timing="http://www.fortiss.org/af3/task/timing" xmlns:org-fortiss-af3-timing="http://www.fortiss.org/af3/timing" xmlns:org-fortiss-af3-timing-annotation="http://www.fortiss.org/af3/timing/annotation" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" xmi:id="26" id="26" name="[TEST] DSE JUnit Test Cases" af3Version="2.16.0.qualifier">
<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-allocation="http://www.fortiss.org/af3/allocation" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-annotation="http://www.fortiss.org/af3/platform/annotation" xmlns:org-fortiss-af3-platform-generic="http://www.fortiss.org/af3/platform/generic" xmlns:org-fortiss-af3-platform-hierarchic-annotation="http://www.fortiss.org/af3/platform/hierarchic/annotation" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-safety-annotation="http://www.fortiss.org/af3/safety/annotation" xmlns:org-fortiss-af3-task="http://www.fortiss.org/af3/task" xmlns:org-fortiss-af3-task-allocation="http://www.fortiss.org/af3/task/allocation" xmlns:org-fortiss-af3-task-annotation="http://www.fortiss.org/af3/task/annotation" xmlns:org-fortiss-af3-task-timing="http://www.fortiss.org/af3/task/timing" xmlns:org-fortiss-af3-timing="http://www.fortiss.org/af3/timing" xmlns:org-fortiss-af3-timing-annotation="http://www.fortiss.org/af3/timing/annotation" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" xmi:id="26" id="26" name="system_test_flat" af3Version="2.16.0.qualifier">
<rootElements xsi:type="org-fortiss-af3-project:ProjectConfiguration" xmi:id="1" id="1">
<configurationElements xsi:type="org-fortiss-af3-project-configuration:TypeSystemConfiguration" xmi:id="2" id="2">
<typesystem xsi:type="org-fortiss-af3-expression:MicroTypeSystem"/>
......@@ -15,7 +15,7 @@
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="9" id="9" name="Component A" comment="">
<specifications xsi:type="org-fortiss-af3-component:CausalityComponentSpecification" xmi:id="10" id="10"/>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="11" id="11"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="12" id="12"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="12" id="12" isSafetyValueSet="true"/>
<connectors xsi:type="org-fortiss-af3-component:OutputPort" xmi:id="21" id="21" name="Output" comment="" outgoing="25">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="22" id="22">
<type xsi:type="org-fortiss-af3-expression-types:TInt"/>
......@@ -33,7 +33,7 @@
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="13" id="13" name="Component B" comment="">
<specifications xsi:type="org-fortiss-af3-component:CausalityComponentSpecification" xmi:id="14" id="14"/>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="15" id="15"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="16" id="16" silValue="SIL 3"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="16" id="16" silValue="SIL 3" isSafetyValueSet="true"/>
<connectors xsi:type="org-fortiss-af3-component:InputPort" xmi:id="23" id="23" name="Input" comment="" incoming="25">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="24" id="24">
<type xsi:type="org-fortiss-af3-expression-types:TInt"/>
......@@ -66,7 +66,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:PowerConsumption" xmi:id="32" id="32"/>
<specifications xsi:type="org-fortiss-af3-platform-hierarchic-annotation:FailureRate" xmi:id="33" id="33"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:HardwareCost" xmi:id="34" id="34"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="35" id="35" silValue="SIL 2"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="35" id="35" silValue="SIL 2" isSafetyValueSet="true"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:FlashSize" xmi:id="36" id="36" bytes="50"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="558" id="558"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:BooleanSize" xmi:id="559" id="559"/>
......@@ -95,7 +95,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:PowerConsumption" xmi:id="515" id="515"/>
<specifications xsi:type="org-fortiss-af3-platform-hierarchic-annotation:FailureRate" xmi:id="516" id="516"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:HardwareCost" xmi:id="517" id="517"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="518" id="518" silValue="SIL 2"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="518" id="518" silValue="SIL 2" isSafetyValueSet="true"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:FlashSize" xmi:id="519" id="519" bytes="100"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="562" id="562"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:BooleanSize" xmi:id="563" id="563"/>
......@@ -162,6 +162,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:FloatSize" xmi:id="567" id="567"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="568" id="568"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:BooleanSize" xmi:id="569" id="569"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="570" id="570" safetyStandard="IEC 61508"/>
<connections xsi:type="org-fortiss-af3-platform:TransmissionConnection" xmi:id="527" id="527" name="" comment="" source="525" target="526">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
</connections>
......
......@@ -15,7 +15,7 @@
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="9" id="9" name="Component A" comment="">
<specifications xsi:type="org-fortiss-af3-component:CausalityComponentSpecification" xmi:id="10" id="10"/>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="11" id="11"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="12" id="12"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="12" id="12" isSafetyValueSet="true"/>
<connectors xsi:type="org-fortiss-af3-component:OutputPort" xmi:id="21" id="21" name="Output" comment="" outgoing="25">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="22" id="22">
<type xsi:type="org-fortiss-af3-expression-types:TInt"/>
......@@ -33,7 +33,7 @@
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="13" id="13" name="Component B" comment="">
<specifications xsi:type="org-fortiss-af3-component:CausalityComponentSpecification" xmi:id="14" id="14"/>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="15" id="15"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="16" id="16" silValue="SIL 3"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="16" id="16" silValue="SIL 3" isSafetyValueSet="true"/>
<connectors xsi:type="org-fortiss-af3-component:InputPort" xmi:id="23" id="23" name="Input" comment="" incoming="25">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="24" id="24">
<type xsi:type="org-fortiss-af3-expression-types:TInt"/>
......@@ -204,6 +204,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:FlashSize" xmi:id="975" id="975"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:IntegerSize" xmi:id="976" id="976"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="2621" id="2621"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="2628" id="2628"/>
<connectors xsi:type="org-fortiss-af3-platform-hierarchic-processor:BusMasterPort" xmi:id="1445" id="1445" name="BusMasterPort" outgoing="1459">
<specifications xsi:type="org-fortiss-af3-platform-hierarchic-annotation:FailureRate" xmi:id="1446" id="1446"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:ArchitectureDomainLabel" xmi:id="1447" id="1447"/>
......@@ -286,6 +287,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:FlashSize" xmi:id="984" id="984" bytes="100"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:IntegerSize" xmi:id="985" id="985"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="2622" id="2622"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="2629" id="2629"/>
<connections xsi:type="org-fortiss-af3-platform:TransmissionConnection" xmi:id="1459" id="1459" name="" comment="" source="1445" target="1455">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="420" y="228"/>
......@@ -383,6 +385,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:FlashSize" xmi:id="993" id="993" bytes="100"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:IntegerSize" xmi:id="994" id="994"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="2623" id="2623"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="2630" id="2630" silValue="SIL 3" isSafetyValueSet="true"/>
<connections xsi:type="org-fortiss-af3-platform:TransmissionConnection" xmi:id="1393" id="1393" name="" comment="" source="1385" target="1389">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
</connections>
......@@ -446,6 +449,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:FlashSize" xmi:id="1493" id="1493" bytes="50"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:IntegerSize" xmi:id="1494" id="1494"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="2624" id="2624"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="2631" id="2631"/>
<connectors xsi:type="org-fortiss-af3-platform-hierarchic-processor:BusMasterPort" xmi:id="1495" id="1495" name="BusMasterPort" outgoing="1534">
<specifications xsi:type="org-fortiss-af3-platform-hierarchic-annotation:FailureRate" xmi:id="1496" id="1496"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:ArchitectureDomainLabel" xmi:id="1497" id="1497"/>
......@@ -528,6 +532,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:FlashSize" xmi:id="1532" id="1532" bytes="50"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:IntegerSize" xmi:id="1533" id="1533"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="2625" id="2625"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="2632" id="2632"/>
<connections xsi:type="org-fortiss-af3-platform:TransmissionConnection" xmi:id="1534" id="1534" name="" comment="" source="1495" target="1517">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="420" y="228"/>
......@@ -625,6 +630,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:FlashSize" xmi:id="1574" id="1574"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:IntegerSize" xmi:id="1575" id="1575"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="2626" id="2626"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="2633" id="2633" silValue="SIL 3" isSafetyValueSet="true"/>
<connections xsi:type="org-fortiss-af3-platform:TransmissionConnection" xmi:id="1576" id="1576" name="" comment="" source="1537" target="1547">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="288" y="180"/>
......@@ -671,6 +677,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:BooleanSize" xmi:id="895" id="895"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:FloatSize" xmi:id="896" id="896"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="2627" id="2627"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="2634" id="2634" safetyStandard="IEC 61508"/>
<connections xsi:type="org-fortiss-af3-platform:TransmissionConnection" xmi:id="1588" id="1588" name="" comment="" source="1584" target="956">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="192" y="252"/>
......
safety.ecore b92e234ad28258eae391834e4571396e2176ab0a GREEN
safety.ecore 547666b5e7c414c92ba5cc693b71a86f9ca9a4f2 GREEN
......@@ -13,6 +13,7 @@
<eLiterals name="ASILB" value="2" literal="ASIL B"/>
<eLiterals name="ASILC" value="3" literal="ASIL C"/>
<eLiterals name="ASILD" value="4" literal="ASIL D"/>
<eLiterals name="UNDEFINED" value="5"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="DAL">
<eLiterals name="DALE" literal="DAL E"/>
......@@ -20,6 +21,7 @@
<eLiterals name="DALC" value="2" literal="DAL C"/>
<eLiterals name="DALB" value="3" literal="DAL B"/>
<eLiterals name="DALA" value="4" literal="DAL A"/>
<eLiterals name="UNDEFINED" value="5"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="SIL">
<eLiterals name="SIL0" literal="SIL0"/>
......@@ -27,6 +29,7 @@
<eLiterals name="SIL2" value="2" literal="SIL 2"/>
<eLiterals name="SIL3" value="3" literal="SIL 3"/>
<eLiterals name="SIL4" value="4" literal="SIL 4"/>
<eLiterals name="UNDEFINED" value="5"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="UndefinedStandard"/>
<eClassifiers xsi:type="ecore:EEnum" name="HwComplexity_Type">
......@@ -115,9 +118,8 @@
<details key="documentation" value="Dummy attributed used when saftey standard is set to {@code undefined}."/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="selectedSafetyLevel"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEnumerator"
transient="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isSafetyValueSet" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
<eGenericSuperTypes eClassifier="ecore:EClass platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/DerivedAnnotationBase">
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEnumerator"/>
</eGenericSuperTypes>
......
......@@ -21,6 +21,7 @@
<genEnumLiterals ecoreEnumLiteral="safety.ecore#//ASIL/ASILB"/>
<genEnumLiterals ecoreEnumLiteral="safety.ecore#//ASIL/ASILC"/>
<genEnumLiterals ecoreEnumLiteral="safety.ecore#//ASIL/ASILD"/>
<genEnumLiterals ecoreEnumLiteral="safety.ecore#//ASIL/UNDEFINED"/>
</genEnums>
<genEnums typeSafeEnumCompatible="false" ecoreEnum="safety.ecore#//DAL">
<genEnumLiterals ecoreEnumLiteral="safety.ecore#//DAL/DALE"/>
......@@ -28,6 +29,7 @@
<genEnumLiterals ecoreEnumLiteral="safety.ecore#//DAL/DALC"/>
<genEnumLiterals ecoreEnumLiteral="safety.ecore#//DAL/DALB"/>
<genEnumLiterals ecoreEnumLiteral="safety.ecore#//DAL/DALA"/>
<genEnumLiterals ecoreEnumLiteral="safety.ecore#//DAL/UNDEFINED"/>
</genEnums>
<genEnums typeSafeEnumCompatible="false" ecoreEnum="safety.ecore#//SIL">
<genEnumLiterals ecoreEnumLiteral="safety.ecore#//SIL/SIL0"/>
......@@ -35,6 +37,7 @@
<genEnumLiterals ecoreEnumLiteral="safety.ecore#//SIL/SIL2"/>
<genEnumLiterals ecoreEnumLiteral="safety.ecore#//SIL/SIL3"/>
<genEnumLiterals ecoreEnumLiteral="safety.ecore#//SIL/SIL4"/>
<genEnumLiterals ecoreEnumLiteral="safety.ecore#//SIL/UNDEFINED"/>
</genEnums>
<genEnums typeSafeEnumCompatible="false" ecoreEnum="safety.ecore#//UndefinedStandard"/>
<genEnums typeSafeEnumCompatible="false" ecoreEnum="safety.ecore#//HwComplexity_Type">
......@@ -65,7 +68,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute safety.ecore#//annotation/SafetyIntegrityLevel/dalValue"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute safety.ecore#//annotation/SafetyIntegrityLevel/silValue"/>
<genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute safety.ecore#//annotation/SafetyIntegrityLevel/undefinedStandardValue"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute safety.ecore#//annotation/SafetyIntegrityLevel/selectedSafetyLevel"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute safety.ecore#//annotation/SafetyIntegrityLevel/isSafetyValueSet"/>
<genOperations ecoreOperation="safety.ecore#//annotation/SafetyIntegrityLevel/getDerivedValue"
body="return SafetyIntegrityLevelStaticImpl.getDerivedValue(this);"/>
<genOperations ecoreOperation="safety.ecore#//annotation/SafetyIntegrityLevel/getDerivedFeature"
......
HwComplexityStaticImpl.java c2831359544871abc99c4b64d671090c5adb01cb GREEN
SafetyIntegrityLevelStaticImpl.java 7cfba4594a028154f4b551cc93ade81306747864 GREEN
SafetyIntegrityLevelStaticImpl.java 95e8723f5edd03a72fab2c4fab01cc74585c61d9 GREEN
......@@ -183,7 +183,9 @@ public class SafetyIntegrityLevelStaticImpl {
/** Returns the user annotated value based on the root {@link SafetyStandard}. */
public static Enumerator getUserAnnotatedValue(SafetyIntegrityLevelImpl specification) {
return specification.getSelectedSafetyLevel();
SafetyStandard safetyStandard = getSafetyStandardOf(specification);
return specification.isIsSafetyValueSet()
? (Enumerator)specification.eGet(getSafetyEnumeratorOf(safetyStandard)) : null;
}
/**
......@@ -229,10 +231,14 @@ public class SafetyIntegrityLevelStaticImpl {
}
SafetyStandard safetyStandard = getSafetyStandardOf(specification);
if(safetyStandard != SafetyStandard.UNDEFINED) {
if(value == SIL.UNDEFINED || value == ASIL.UNDEFINED || value == DAL.UNDEFINED) {
specification.eUnset(getSafetyEnumeratorOf(safetyStandard));
specification.setIsSafetyValueSet(false);
return (Enumerator)specification.eGet(getDerivedFeature(specification));
} else if(safetyStandard != SafetyStandard.UNDEFINED) {
specification.eSet(getSafetyEnumeratorOf(safetyStandard), value);
specification.setSelectedSafetyLevel(value);
return specification.getSelectedSafetyLevel();
specification.setIsSafetyValueSet(true);
return (Enumerator)specification.eGet(getDerivedFeature(specification));
}
return null;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment