Commit 8e130cbb authored by Tiziano Munaro's avatar Tiziano Munaro
Browse files

Merge remote-tracking branch 'origin/master' into 4031

parents e56ac4da 776b48c8
ApplicationCommandHandler.java 6a52a54b64cd8eae1f7a28b12388a5f46df6a2ec YELLOW
ApplicationCommandHandler.java 3225d9f72590fcea939b14cae05467cbace1f438 GREEN
......@@ -91,9 +91,6 @@ public class ApplicationCommandHandler {
*/
private synchronized static void loadExistingModel(String pluginID, String relativePath,
String projectName) {
// Enable AF3 Perspective.
switchToAF3Perspective();
URI fileURI = createPlatformPluginURI(pluginID + File.separator + relativePath, true);
try {
......
......@@ -31,7 +31,7 @@
<specifications xsi:type="org-fortiss-af3-platform-hierarchic-annotation:FailureRate" xmi:id="3594" id="3594"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:PowerConsumption" xmi:id="3595" id="3595"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:RamSize" xmi:id="3596" id="3596"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="3597" id="3597"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="3597" id="3597" asilValue="ASIL B" isSafetyValueSet="true"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:HardwareCost" xmi:id="3598" id="3598"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="3669" id="3669"/>
<connectors xsi:type="org-fortiss-af3-platform-generic:GenericTransceiver" xmi:id="181" id="181" name="GenericTransceiver" outgoing="183">
......@@ -67,7 +67,7 @@
<specifications xsi:type="org-fortiss-af3-platform-hierarchic-annotation:FailureRate" xmi:id="3604" id="3604"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:PowerConsumption" xmi:id="3605" id="3605"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:RamSize" xmi:id="3606" id="3606"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="3607" id="3607"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="3607" id="3607" asilValue="ASIL A" isSafetyValueSet="true"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:HardwareCost" xmi:id="3608" id="3608"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="3670" id="3670"/>
<connectors xsi:type="org-fortiss-af3-platform-generic:GenericTransceiver" xmi:id="178" id="178" name="GenericTransceiver" outgoing="182">
......@@ -146,7 +146,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:FloatSize" xmi:id="3612" id="3612"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:IntegerSize" xmi:id="3613" id="3613"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="3671" id="3671"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="3913" id="3913"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="3913" id="3913" safetyStandard="ISO 26262"/>
<connections xsi:type="org-fortiss-af3-platform:TransmissionConnection" xmi:id="182" id="182" name="" comment="" source="178" target="179">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
</connections>
......@@ -4342,7 +4342,7 @@
</containedElements>
<specifications xsi:type="org-fortiss-af3-component:CausalityComponentSpecification" xmi:id="3505" id="3505"/>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="3563" id="3563"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="3668" id="3668"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="3668" id="3668" safetyStandard="ISO 26262"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="108" height="72"/>
</containedElements>
......
Markdown is supported
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