генерация задач с обновленными параметрами.

This commit is contained in:
2025-03-04 16:30:32 +03:00
parent 9c0f3215ad
commit e8d6764563
7 changed files with 107 additions and 33 deletions

View File

@@ -5,7 +5,9 @@ import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsSetJson;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsSetJson;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
import javafx.util.Pair;
import java.util.LinkedHashMap;
import java.util.Vector;
public class DVMSettingsCache extends VisualCache {
public OptionsSetJson optionsSetJson=null;
@@ -30,11 +32,33 @@ public class DVMSettingsCache extends VisualCache {
for (OptionsJson optionsJson: optionsSetJson.values){
optionsSummary_.add(optionsJson.toLine());
}
optionsSummary = String.join("\n", optionsSummary_);
optionsSummary = String.join(";\n", optionsSummary_);
Vector<String> environmentsSummary_ = new Vector<>();
for (EnvironmentsJson environmentsJson: environmentsSetJson.values){
environmentsSummary_.add(environmentsJson.toLine());
}
environmentsSummary = String.join("\n", environmentsSummary_);
environmentsSummary = String.join(";\n", environmentsSummary_);
}
public Vector<Pair<String, String>> getTasksParameters(){
//уравниваем количество наборов опций и окружений и сопоставляем 1 к 1
Vector<Pair<String, String>> res = new Vector<>();
for (int i=0;i< optionsSetJson.values.size(); ++i){
String optionsLine = optionsSetJson.values.get(i).toLine();
String environmentsLine = (i< environmentsSetJson.values.size())?
environmentsSetJson.values.get(i).toLine() : "";
res.add(new Pair<>(
optionsLine,
environmentsLine));
}
if (optionsSetJson.values.size()<environmentsSetJson.values.size()){
for (int i= optionsSetJson.values.size(); i<environmentsSetJson.values.size(); ++i){
res.add(new Pair<>(
"",
environmentsSetJson.values.get(i).toLine()
));
}
}
return res;
}
}