Changeset 1978 for trunk

Timestamp:

06/24/15 15:26:27 (9 years ago)

Author:

sherbold

Message:

• updated message parameter generation: now the instance specification are directly used as the argument, and not as the operand of an expression

File:

• trunk/autoquest-plugin-uml/src/main/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtils.java (modified) (3 diffs)

trunk/autoquest-plugin-uml/src/main/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtils.java

@@ -1072 +1072 @@
             String path = calledOperation.getName() + ":" + param.getType().getName();
             // create param node
-            Expression argument =
-                (Expression) callMessage.createArgument(param.getName(), param.getType(),
-                                                        UMLPackage.Literals.EXPRESSION);
-
+//            Expression argument =
+//                (Expression) callMessage.createArgument(param.getName(), param.getType(),
+//                                                        UMLPackage.Literals.EXPRESSION);
             if (isInParameter(param)) {
                 
@@ -1087 +1086 @@
                                                           UMLPackage.Literals.INSTANCE_SPECIFICATION);
                 instSpecParameters.getClassifiers().add((DataType) param.getType());
-                InstanceValue parametersValue =
-                        (InstanceValue) argument
-                            .createOperand(param.getType().getName(), param.getType(),
-                                           UMLPackage.Literals.INSTANCE_VALUE);
-                parametersValue.setInstance(instSpecParameters);
+//                InstanceValue parametersValue =
+//                        (InstanceValue) argument
+//                            .createOperand(param.getType().getName(), param.getType(),
+//                                           UMLPackage.Literals.INSTANCE_VALUE);
+//                parametersValue.setInstance(instSpecParameters);
+                InstanceValue instanceValue = (InstanceValue) callMessage.createArgument(param.getName(), param.getType(), UMLPackage.Literals.INSTANCE_VALUE);
+                instanceValue.setInstance(instSpecParameters);
                 
                 for( Property internalParameter : parametersNode.getAllAttributes() ) {
@@ -1141 +1142 @@
             else {
                 // set literalNull for out and return parameters
-                argument.createOperand(null, param.getType(), UMLPackage.Literals.LITERAL_NULL);
+//                argument.createOperand(null, param.getType(), UMLPackage.Literals.LITERAL_NULL);
+                callMessage.createArgument(param.getName(), param.getType(), UMLPackage.Literals.LITERAL_NULL);
             }
         }