From b0db62336cf5b257c5703b0891b2020cb80e4a2e Mon Sep 17 00:00:00 2001
From: Florian Lambers <fl462057@fh-muenster.de>
Date: Fri, 17 Dec 2021 15:30:50 +0100
Subject: [PATCH] refactored readVariables part 2
---
.../Testgenerator/migration/MigrationService.java | 10 +++++-----
.../rest/service/change/ChangeController.java | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/migration/MigrationService.java b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/migration/MigrationService.java
index 90d78ed..a04e951 100644
--- a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/migration/MigrationService.java
+++ b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/migration/MigrationService.java
@@ -709,7 +709,7 @@ public class MigrationService {
HashMap<String, List<VariableReference>> hashMapInputVariables = new HashMap<>();
for(UserTaskFlowElement e : oldDSL.getUserTaskFlowElements()) {
- hashMapInputVariables.put(e.getName(), e.getReadVariables());
+ hashMapInputVariables.put(e.getName(), e.getInputVariables());
}
List<UserTaskFlowElement> neededUserTasks = new ArrayList<>();
@@ -720,7 +720,7 @@ public class MigrationService {
if(oldInputVariables != null) {
//Die UserTask ist auch in der neuen DSL vorhanden
//Prüfen, ob es eine neue InputVariable gibt (nur Anzahl prüfen reicht nicht)
- List<VariableReference> newVariables = e.getReadVariables();
+ List<VariableReference> newVariables = e.getInputVariables();
List<VariableReference> newInputVariables = new BasicEList<>();
@@ -782,7 +782,7 @@ public class MigrationService {
HashMap<String, List<VariableReference>> hashMapInputVariables = new HashMap<>();
for(UserTaskFlowElement e : oldDSL.getUserTaskFlowElements()) {
- hashMapInputVariables.put(e.getName(), e.getReadVariables());
+ hashMapInputVariables.put(e.getName(), e.getInputVariables());
}
List<UserTaskFlowElement> neededUserTasks = new ArrayList<>();
@@ -792,7 +792,7 @@ public class MigrationService {
//Die UserTask ist auch in der neuen DSL vorhanden
//Prüfen, ob es eine neue InputVariable gibt (nur Anzahl prüfen reicht nicht)
- List<VariableReference> newVariables = e.getReadVariables();
+ List<VariableReference> newVariables = e.getInputVariables();
List<VariableReference> deletedInputVariables = new BasicEList<>();
//System.out.println(newVariables.toString());
@@ -2117,7 +2117,7 @@ public class MigrationService {
if (element instanceof UserTaskFlowElement) {
UserTaskFlowElement ue = (UserTaskFlowElement) element;
- for(VariableReference vr : ue.getReadVariables()) {
+ for(VariableReference vr : ue.getInputVariables()) {
if(vr.getValidationStatus().equals(ValidationState.REQUIRED)) {
return true;
}
diff --git a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/change/ChangeController.java b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/change/ChangeController.java
index 003d621..59eadeb 100644
--- a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/change/ChangeController.java
+++ b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/change/ChangeController.java
@@ -291,9 +291,9 @@ public class ChangeController {
if(oldDSL.getFlowElements(Arrays.asList(tv.getTask())).get(0) instanceof UserTaskFlowElement
&& newDSL.getFlowElements(Arrays.asList(tv.getTask())).get(0) instanceof UserTaskFlowElement) {
UserTaskFlowElement oldUserTask = (UserTaskFlowElement) oldDSL.getFlowElements(Arrays.asList(tv.getTask())).get(0);
- oldInputVariables = oldUserTask.getReadVariables();
+ oldInputVariables = oldUserTask.getInputVariables();
UserTaskFlowElement newUserTask = (UserTaskFlowElement) newDSL.getFlowElements(Arrays.asList(tv.getTask())).get(0);
- newInputVariables = newUserTask.getReadVariables();
+ newInputVariables = newUserTask.getInputVariables();
}
else {
if(oldDSL.getFlowElements(Arrays.asList(tv.getTask())).get(0) instanceof StartFlowElement
--
GitLab