ST6RI-921 Updated examples with validation errors due to previous change

Author: seidewitz

kerml/src/examples/Simple Tests/Filtering.kerml

@@ -23,15 +23,17 @@ package Filtering {
 
 	package UpperLevelApprovals {
 	    private import DesignModel::**;
-	    filter Annotations::ApprovalAnnotation::approved and 
-	           Annotations::ApprovalAnnotation::level > 1;
+	    filter (as Annotations::ApprovalAnnotation).approved and 
+	           (as Annotations::ApprovalAnnotation).level > 1;
 
 	    struct Test :> System;
 	}
 
 	package UpperLevelApprovals1 {
 	    private import Annotations::**;
-	    private import DesignModel::**[@Structure][approved and level > 1];
+	    private import DesignModel::**[@Structure]
+		    [(as Annotations::ApprovalAnnotation).approved and 
+	         (as Annotations::ApprovalAnnotation).level > 1];
 
 	    struct Test :> System;	    
 	}

sysml/src/examples/Vehicle Example/SysML v2 Spec Annex A SimpleVehicleModel.sysml

@@ -1536,7 +1536,7 @@ package SimpleVehicleModel{
         package MandatorySafetyGroup {
             /* Parts that contribute to safety AND are mandatory. */
             public import vehicle_b::**;
-            filter @Safety and Safety::isMandatory;
+            filter (as Safety).isMandatory;
         }
     }
     package Views_Viewpoints{

sysml/src/training/40. Filtering/Filtering Example-1.sysml

@@ -32,6 +32,6 @@ package 'Filtering Example-1' {
 	package 'Mandatory Safety Features' {
 		/* Parts that contribute to safety AND are mandatory. */
 		public import vehicle::**;
-		filter @Safety and Safety::isMandatory;
+		filter @Safety and (as Safety).isMandatory;
 	}
 }

sysml/src/training/40. Filtering/Filtering Example-2.sysml

@@ -30,6 +30,6 @@ package 'Filtering Example-2' {
 
 	package 'Mandatory Safety Features' {
 		/* Parts that contribute to safety AND are mandatory. */
-		public import vehicle::**[@Safety and Safety::isMandatory];
+		public import vehicle::**[@Safety and (as Safety).isMandatory];
 	}
 }

sysml/src/validation/11-View and Viewpoint/11b-Safety and Security Feature Views.sysml

@@ -54,11 +54,11 @@ package '11b-Safety and Security Feaure Views' {
 
 		view vehicleMandatorySafetyFeatureView :> vehicleSafetyFeatureView {
 		    expose vehicle::*::**;
-			filter Safety::isMandatory;
+			filter (as Safety).isMandatory;
 		}
 
 		view vehicleMandatorySafetyFeatureViewStandalone {
-			expose vehicle::**[@Safety and Safety::isMandatory];
+			expose vehicle::**[(as Safety).isMandatory];
 			render asElementTable;
 		}	
 	}

sysml/src/validation/13-Model Containment/13b-Safety and Security Features Element Group-1.sysml

@@ -51,6 +51,6 @@ package '13b-Safety and Security Features Element Group-1' {
 	package 'Mandatory Safety Features' {
 		/* Parts that contribute to safety AND are mandatory. */
 		public import vehicle::**;
-		filter @Safety and Safety::isMandatory;
+		filter @Safety and (as Safety).isMandatory;
 	}
 }

sysml/src/validation/13-Model Containment/13b-Safety and Security Features Element Group-2.sysml

@@ -47,6 +47,6 @@ package '13b-Safety and Security Features Element Group-2' {
 
 	package 'Mandatory Saftey Features' {
 		/* Parts that contribute to safety AND are mandatory. */
-		public import vehicle::**[@Safety and Safety::isMandatory];
+		public import vehicle::**[@Safety and (as Safety).isMandatory];
 	}
 }