diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java b/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java index f095b0b0..f9daee31 100644 --- a/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java +++ b/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java @@ -9,9 +9,10 @@ import java.util.List; import java.util.Vector; public class DVMPackage_json implements Serializable { @Expose - public int max_compilation_task_id = 0; - @Expose - public int max_run_task_id = 0; + public int max_task_id = 0; @Expose public List compilationTasks = new Vector<>(); + public int getMaxTaskId(){ + return max_task_id++; + } } diff --git a/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java b/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java index c7d6886c..f0f53a57 100644 --- a/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java +++ b/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java @@ -153,12 +153,12 @@ public class AddTasksToDVMPackage extends Pass_2021 { //инициализируем идентификаторы задач. for (DVMCompilationTask compilationTask : tasks) { //-- - compilationTask.id = json.max_compilation_task_id; - json.max_compilation_task_id++; + compilationTask.id = json.max_task_id; + json.max_task_id++; //- for (DVMRunTask runTask : compilationTask.runTasks) { - runTask.id = json.max_run_task_id; - json.max_run_task_id++; + runTask.id = json.max_task_id; + json.max_task_id++; runTask.dvmcompilationtask_id = compilationTask.id; } }