Merge branch '3945' into 'master'

DSE Patterns: Allow different standards for safety

See merge request af3/af3!295

org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/util/.ratings

@@ -6,4 +6,4 @@ ExplorationModelElementFactory.java bb48b2d09b92efcb1b2d3e382555089bb7ed5db5 GRE
 ExplorationReflectionUtils.java 62731e1cef32fe93f2c2017f93f5ba1f054d5197 GREEN
 ExplorationUtils.java 79f8960b63762045008d27def3752d735dad43f0 GREEN
 ModelSnapshotExtractUtils.java 4f023e1247701c0e8f329575caddbbcac0066200 GREEN
-PatternFactoryUtils.java 072de2d8387896570a7c3e368b64e57e962b2304 GREEN
+PatternFactoryUtils.java 6a8815a2fcd5d7f0cc8169d11154b04867f06bcd GREEN

org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/util/PatternFactoryUtils.java

@@ -52,6 +52,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.eclipse.emf.common.util.Enumerator;
 import org.fortiss.af3.component.model.Component;
 import org.fortiss.af3.exploration.dseml.model.arithmetic.ArithmeticLiteral;
 import org.fortiss.af3.exploration.dseml.model.arithmetic.ArithmeticPropertyLiteral;
@@ -83,7 +84,6 @@ import org.fortiss.af3.platform.model.ExecutionUnit;
 import org.fortiss.af3.platform.model.Route;
 import org.fortiss.af3.platform.model.TransmissionUnit;
 import org.fortiss.af3.platform.model.annotation.MessageSize;
-import org.fortiss.af3.safety.model.SIL;
 import org.fortiss.af3.safety.model.annotation.SafetyIntegrityLevel;
 import org.fortiss.af3.task.model.Signal;
 import org.fortiss.af3.task.model.Task;
@@ -379,8 +379,10 @@ public class PatternFactoryUtils {
 			isTrue(alloc.isPresent(),
 					"Could not determine the coomponent(s) mapped to the task " + task.getName());
 
-			Integer sil = alloc.get().getComponents().stream().mapToInt(
-					c -> getAnnotationValue(c, SafetyIntegrityLevel.class, SIL.class).getValue())
+			Integer sil = alloc.get().getComponents().stream()
+					.mapToInt(
+							c -> getAnnotationValue(c, SafetyIntegrityLevel.class, Enumerator.class)
+									.getValue())
 					.max().getAsInt();
 			taskSils.put(task.getId(), sil);
 		}