Changeset 1352 for trunk

Timestamp:

02/24/12 15:50:39 (13 years ago)

Author:

wschamai

Message:

• enhancements for verification models composition and report generation

File:

• trunk/modelicaml/org.openmodelica.modelicaml.helper/src/org/openmodelica/modelicaml/helper/impl/VerificationVerdictElementsGenerator.java (modified) (3 diffs)

trunk/modelicaml/org.openmodelica.modelicaml.helper/src/org/openmodelica/modelicaml/helper/impl/VerificationVerdictElementsGenerator.java

@@ -155 +155 @@
                     Stereotype reqStereotype = t.getAppliedStereotype(Constants.stereotypeQName_Requirement);
                     if (reqStereotype != null) {
-                        Property violated = ((Class)t).getOwnedAttribute(Constants.propertyName_violated, null);
-                        Property evaluated = ((Class)t).getOwnedAttribute(Constants.propertyName_evaluated, null);
-                        if ( violated != null && evaluated != null) {
-                            Type violatedType = violated.getType();
-                            Type evaluatedType = evaluated.getType();
-                            if (violatedType != null && evaluatedType != null ) {
-                                if (violatedType.getName().equals(Constants.predefinedTypeName_boolean) && evaluatedType.getName().equals(Constants.predefinedTypeName_boolean)) {
+//                      Property violated = ((Class)t).getOwnedAttribute(Constants.propertyName_violated, null);
+//                      Property evaluated = ((Class)t).getOwnedAttribute(Constants.propertyName_evaluated, null);
+                        Property mStatus = ((Class)t).getOwnedAttribute(Constants.propertyName_mStatus, null);
+
+//                      if ( (violated != null && evaluated != null) || mStatus != null) {
+                        if ( mStatus != null ) {
+//                          Type violatedType = violated.getType();
+//                          Type evaluatedType = evaluated.getType();
+                            Type mStatusType = mStatus.getType();
+
+//                          if (violatedType != null && evaluatedType != null ) {
+                            if (mStatusType != null) {
+                            // check if the type is correct
+//                              if (violatedType.getName().equals(Constants.predefinedTypeName_boolean) && evaluatedType.getName().equals(Constants.predefinedTypeName_boolean)) {
+                                if (mStatusType.getName().equals(Constants.predefinedTypeName_integer)) {
                                     reqInstances.add(property);
                                 }
@@ -178 +186 @@
                 }
             }
+            
             for (Property property : reqInstances) {
                 //violatedExpression = violatedExpression + Utls.replaceSpecChar(property.getName()) + ".violated, ";
-                violatedExpression = violatedExpression + StringUtls.replaceSpecChar(property.getName()) + "."+Constants.propertyName_violated+" or ";
-                evaluatedExpression = evaluatedExpression + StringUtls.replaceSpecChar(property.getName()) + "."+Constants.propertyName_evaluated+" and ";
+                
+                // TODO: use mStatus with 
+                violatedExpression = violatedExpression + StringUtls.replaceSpecChar(property.getName()) + "."+Constants.propertyName_mStatus+" == 2" +" or ";
+                evaluatedExpression = evaluatedExpression + StringUtls.replaceSpecChar(property.getName()) + "."+Constants.propertyName_mStatus + " > 0" +" and ";
+
+//              violatedExpression = violatedExpression + StringUtls.replaceSpecChar(property.getName()) + "."+Constants.propertyName_violated+" or ";
+//              evaluatedExpression = evaluatedExpression + StringUtls.replaceSpecChar(property.getName()) + "."+Constants.propertyName_evaluated+" and ";
             }
         }
@@ -192 +206 @@
             Shell shell = new Shell();
             MessageDialog.openError(shell, "Error", 
-                    "The following requirements do not have the manatory attributes '"
-                    +Constants.propertyName_evaluated+
-                    "' and '"+Constants.propertyName_violated+"' of type 'ModelicaBoolean'." +
+                    "The following requirements do not have the mandatory attribute '"
+                    +Constants.propertyName_mStatus+ "' of type 'ModelicaInteger'." +
                 invalidComponentNames + 
                 "\n\nNo verification verdict was created in '"+selectedClass.getName()+"'.");