M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2025-03-13 00:32:20 +03:00
parent 91e40c4393
commit 1d97048de1
204 changed files with 984 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/_VisualDVM/ServerObjectsCache/DVMSettingsCache.java
View File

@@ -7,11 +7,10 @@ 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;
public EnvironmentsSetJson environmentsSetJson=null;
public OptionsSetJson optionsSetJson = null;
public EnvironmentsSetJson environmentsSetJson = null;
//--
public String optionsSummary = null;
public String environmentsSummary = null;
@@ -28,31 +27,30 @@ public class DVMSettingsCache extends VisualCache {
else
environmentsSetJson = Utils_.gson.fromJson(dvmSettings.packedRunEnvironmentValuesJson, EnvironmentsSetJson.class);
//--
Vector<String> optionsSummary_=new Vector<>();
for (OptionsJson optionsJson: optionsSetJson.values){
Vector<String> optionsSummary_ = new Vector<>();
for (OptionsJson optionsJson : optionsSetJson.values) {
optionsSummary_.add(optionsJson.toLine());
}
optionsSummary = String.join(";\n", optionsSummary_);
Vector<String> environmentsSummary_ = new Vector<>();
for (EnvironmentsJson environmentsJson: environmentsSetJson.values){
for (EnvironmentsJson environmentsJson : environmentsSetJson.values) {
environmentsSummary_.add(environmentsJson.toLine());
}
environmentsSummary = String.join(";\n", environmentsSummary_);
}
public Vector<Pair<String, String>> getTasksParameters(){
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())?
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){
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()

4
src/_VisualDVM/ServerObjectsCache/PackageCache.java
View File

@@ -8,7 +8,7 @@ import java.util.Vector;
public class PackageCache extends VisualCache {
public ConfigurationsJson configurationsJson = null;
public Vector<String> configurationsDescriptions = null;
public String confifurationsDescriptionsLine= null;
public String confifurationsDescriptionsLine = null;
public PackageCache(TestingPackage testingPackage) {
if (testingPackage.packedConfigurationsJson.isEmpty())
configurationsJson = new ConfigurationsJson(); //просто пустой
@@ -23,7 +23,7 @@ public class PackageCache extends VisualCache {
public Vector<String> getConfigurationsDescriptions() {
return configurationsDescriptions;
}
public String getConfifurationsDescriptionsLine(){
public String getConfifurationsDescriptionsLine() {
return confifurationsDescriptionsLine;
}
}

11
src/_VisualDVM/ServerObjectsCache/TestCache.java
View File

@@ -2,18 +2,17 @@ package _VisualDVM.ServerObjectsCache;
import Common.Utils.Utils_;
import _VisualDVM.TestingSystem.Common.Test.Json.TestFileJson;
import _VisualDVM.TestingSystem.Common.Test.Json.TestFilesJson;
import _VisualDVM.TestingSystem.Common.Test.Json.TestJson;
import _VisualDVM.TestingSystem.Common.Test.Test;
import java.util.Vector;
public class TestCache extends VisualCache{
public String srcNames="";
public class TestCache extends VisualCache {
public String srcNames = "";
public TestCache(Test object) {
Vector<String> names=new Vector<>();
Vector<String> names = new Vector<>();
TestFilesJson json = Utils_.gson.fromJson(object.packedFilesJson, TestFilesJson.class);
for (TestFileJson testJson: json.values){
for (TestFileJson testJson : json.values) {
names.add(testJson.name);
}
srcNames =String.join(";", names);
srcNames = String.join(";", names);
}
}

2
src/_VisualDVM/ServerObjectsCache/VisualCaches.java
View File

@@ -32,7 +32,7 @@ public class VisualCaches {
if (object instanceof DVMConfiguration) return new DVMConfigurationCache((Configuration) object);
if (object instanceof TestingPackage) return new PackageCache((TestingPackage) object);
if (object instanceof DVMSettings) return new DVMSettingsCache((DVMSettings) object);
if (object instanceof Test) return new TestCache((Test)object);
if (object instanceof Test) return new TestCache((Test) object);
return new VisualCache();
}
public static VisualCache GetCache(DBObject object) {