diff --git a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext index 938b17e22800b00912b5e6b6dfe185fc71ab4107..826e492f755ee90ee22246b2417a8eb3bb0b0e58 100644 --- a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext +++ b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext @@ -96,6 +96,7 @@ GatewayFlowElement: SequenceFlowElement: "FlowElement" name=ID ASSOCIATION "SequenceFlow" + ('with' 'readVariables' ASSOCIATION LIST_OPEN (readVariables+=VariableReference (SEPARATOR readVariables+=VariableReference)*)? LIST_CLOSED)? ('with' 'expression' ASSOCIATION expression=STRING)? DECLARATION_FINISHED; diff --git a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/TestgeneratorDSLObjectCreator.java b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/TestgeneratorDSLObjectCreator.java index 053dfe07ae9f499cefa57d2d79534d592607e65c..98fdbba12f4bc38e0c7d79b874b5f00c770831bc 100644 --- a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/TestgeneratorDSLObjectCreator.java +++ b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/TestgeneratorDSLObjectCreator.java @@ -325,10 +325,15 @@ public class TestgeneratorDSLObjectCreator { return element; } - public static SequenceFlowElement createSequenceFlowElement(String name, String expression) { + public static SequenceFlowElement createSequenceFlowElement(String name, String expression, List<Variable> inputVariables) { SequenceFlowElement element = TestgeneratorDSLFactory.eINSTANCE.createSequenceFlowElement(); element.setName(name); element.setExpression(expression); + for (Variable inputVariable : inputVariables) { + VariableReference variableReference = TestgeneratorDSLFactory.eINSTANCE.createVariableReference(); + variableReference.setRef(inputVariable); + element.getReadVariables().add(variableReference); + } return element; }