From 0995c0a6ddd3ed2bfa4d9ac795f21dbf9605d29d Mon Sep 17 00:00:00 2001 From: Florian Lambers <fl462057@fh-muenster.de> Date: Fri, 17 Dec 2021 13:11:35 +0100 Subject: [PATCH] refactored inputVariables, readVariables, writeVariables --- .../fhmuenster/masterthesis/serialization/Main.java | 2 +- .../TestgeneratorDSLObjectCreator.java | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/Main.java b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/Main.java index a7d082a..781ecf1 100644 --- a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/Main.java +++ b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/Main.java @@ -33,7 +33,7 @@ public class Main { FlowElement start = TestgeneratorDSLObjectCreator.createStartFlowElement("Start_123", Arrays.asList(), null); FlowElement gateway = TestgeneratorDSLObjectCreator.createGatewayFlowElement("Gateway_123", null); - FlowElement activity = TestgeneratorDSLObjectCreator.createUserTaskFlowElement("Activity_123", Arrays.asList(), Arrays.asList(), "Activity 123", null, null); + FlowElement activity = TestgeneratorDSLObjectCreator.createUserTaskFlowElement("Activity_123", Arrays.asList(), Arrays.asList(), Arrays.asList(), "Activity 123", null, null); FlowElement end = TestgeneratorDSLObjectCreator.createEndFlowElement("End_123"); FlowElement activity2 = TestgeneratorDSLObjectCreator.createServiceTaskFlowElement("Activity_234"); FlowElement end2 = TestgeneratorDSLObjectCreator.createEndFlowElement("End_234"); 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 cbfbd57..053dfe0 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 @@ -122,7 +122,8 @@ public class TestgeneratorDSLObjectCreator { return element; } - public static UserTaskFlowElement createUserTaskFlowElement(String name, List<Variable> inputVariables, List<Variable> outputVariables, String label, + public static UserTaskFlowElement createUserTaskFlowElement(String name, List<Variable> inputVariables, List<Variable> readVariables, + List<Variable> writeVariables, String label, HashMap<String, List<Constraint>> taskSpecificConstraints, List<Variable> removeVariables) { UserTaskFlowElement element = TestgeneratorDSLFactory.eINSTANCE.createUserTaskFlowElement(); element.setName(name); @@ -147,9 +148,15 @@ public class TestgeneratorDSLObjectCreator { element.getInputVariables().add(variableReference); } - for (Variable outputVariable : outputVariables) { + for (Variable readVariable : readVariables) { VariableReference variableReference = TestgeneratorDSLFactory.eINSTANCE.createVariableReference(); - variableReference.setRef(outputVariable); + variableReference.setRef(readVariable); + element.getReadVariables().add(variableReference); + } + + for (Variable writeVariable : writeVariables) { + VariableReference variableReference = TestgeneratorDSLFactory.eINSTANCE.createVariableReference(); + variableReference.setRef(writeVariable); element.getWriteVariables().add(variableReference); } -- GitLab