Changeset 990 for trunk/modelicaml/org.openmodelica.modelicaml.helper

Timestamp:

09/24/11 09:11:42 (13 years ago)

Author:

wschamai

Message:

 

File:

• trunk/modelicaml/org.openmodelica.modelicaml.helper/src/org/openmodelica/modelicaml/helper/impl/TestVerdictElementsGenerator.java (modified) (4 diffs)

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

@@ -56 +56 @@
 import org.eclipse.uml2.uml.Type;
 import org.eclipse.uml2.uml.UMLPackage;
+import org.openmodelica.modelicaml.common.constants.Constants;
 import org.openmodelica.modelicaml.common.services.StringUtls;
 import org.openmodelica.modelicaml.common.services.UmlServices;
@@ -147 +148 @@
                     Type t = property.getType();
                     if (t instanceof Class) {
-                        Property violated = ((Class)t).getOwnedAttribute("violated", null);
-                        Property evaluated = ((Class)t).getOwnedAttribute("evaluated", null);
+                        Property violated = ((Class)t).getOwnedAttribute(Constants.propertyName_violated, null);
+                        Property evaluated = ((Class)t).getOwnedAttribute(Constants.propertyName_evaluationStarted, null);
                         if ( violated != null && evaluated != null) {
                             Type violatedType = violated.getType();
@@ -172 +173 @@
             for (Property property : reqInstances) {
                 //violatedExpression = violatedExpression + Utls.replaceSpecChar(property.getName()) + ".violated, ";
-                violatedExpression = violatedExpression + StringUtls.replaceSpecChar(property.getName()) + ".violated or ";
-                evaluatedExpression = evaluatedExpression + StringUtls.replaceSpecChar(property.getName()) + ".evaluated and ";
+                violatedExpression = violatedExpression + StringUtls.replaceSpecChar(property.getName()) + "."+Constants.propertyName_violated+" or ";
+                evaluatedExpression = evaluatedExpression + StringUtls.replaceSpecChar(property.getName()) + "."+Constants.propertyName_evaluationStarted+" and ";
             }
         }
@@ -183 +184 @@
             }
             Shell shell = new Shell();
-            MessageDialog.openError(shell, "Error", "The following requirements do not have the mandotory attributes 'evaluated and 'violated' of type 'ModelicaBoolean'." +
+            MessageDialog.openError(shell, "Error", "The following requirements do not have the mandotory attributes '"+Constants.propertyName_evaluationStarted+"' and '"+Constants.propertyName_violated+"' of type 'ModelicaBoolean'." +
                 invalidComponentNames + 
                 "\n\nNo modification was made to the class '"+selectedClass.getName()+"'.");