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

промежуточный.привожу в порядок индексы.

Browse Source
This commit is contained in:
02090095
2025-03-23 02:14:23 +03:00
parent 10c213feae
commit f6cc447481
35 changed files with 526 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java
View File

@@ -12,26 +12,14 @@ import _VisualDVM.TestingSystem.Common.Test.Test;
import java.util.Vector;
public class ConfigurationCache extends VisualCache {
public int configuration_id;
public Vector<String> groupsSummary = null;
public int groupsOnly = 0;
public SettingsArrayJson settingsJson = null;
public int testsCount=0;
public Vector<String> groupsSummary = null;
public String settingsSummary = null;
//--
public ConfigurationCache(Configuration configuration) {
configuration_id = configuration.id;
groupsOnly = configuration.groupsOnly;
//-
if (configuration.packedSettingsJson.isEmpty())
settingsJson = new SettingsArrayJson(); //просто пустой
else
settingsJson = Utils_.gson.fromJson(configuration.packedSettingsJson, SettingsArrayJson.class);
//-
Vector<String> settingsDescriptionsVector = new Vector<>();
for (SettingsJson settingsJson : settingsJson.array)
settingsDescriptionsVector.add(settingsJson.description);
settingsSummary = String.join(";", settingsDescriptionsVector);
}
public int getTestsCount() {
return 0;
}
}

36
src/_VisualDVM/ServerObjectsCache/DVMConfigurationCache.java
View File

@@ -2,10 +2,10 @@ package _VisualDVM.ServerObjectsCache;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Group.Json.GroupJson;
import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsJson;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationSettings.DVMConfigurationSettings;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
import java.util.LinkedHashMap;
@@ -18,28 +18,28 @@ public class DVMConfigurationCache extends ConfigurationCache {
//--
LinkedHashMap<LanguageName, Vector<String>> gmap = new LinkedHashMap<>();
for (DVMConfigurationGroup configurationGroup : configurationGroups) {
if (Global.testingServer.db.groups.containsKey(configurationGroup.group_id)) {
Group group = Global.testingServer.db.groups.get(configurationGroup.group_id);
Vector<String> vector = null;
if (gmap.containsKey(group.language)) {
vector = gmap.get(group.language);
} else {
vector = new Vector<>();
gmap.put(group.language, vector);
}
vector.add(group.description);
Group group = Global.testingServer.db.groups.get(configurationGroup.group_id);
Vector<String> vector = null;
if (gmap.containsKey(group.language)) {
vector = gmap.get(group.language);
} else {
vector = new Vector<>();
gmap.put(group.language, vector);
}
vector.add(group.description);
}
for (LanguageName language : gmap.keySet()) {
groupsSummary.add(language + ": " + String.join(";", gmap.get(language)));
}
}
public Vector<DVMSettings> getSettings() {
Vector<DVMSettings> res = new Vector<>();
for (SettingsJson settingsJson : settingsJson.array) {
if (Global.testingServer.db.dvmSettings.containsKey(settingsJson.id))
res.add(Global.testingServer.db.dvmSettings.get(settingsJson.id));
//--
Vector<DVMConfigurationSettings> configurationSettings = Global.testingServer.db.getVectorByFK(configuration, DVMConfigurationSettings.class);
Vector<String> settingsDescriptionsVector = new Vector<>();
for (DVMConfigurationSettings settings : configurationSettings) {
DVMSettings dvmSettings = Global.testingServer.db.dvmSettings.get(settings.dvmsettings_id);
settingsDescriptionsVector.add(dvmSettings.description);
}
return res;
settingsSummary = String.join(";", settingsDescriptionsVector);
//--
testsCount = Global.testingServer.db.getDVMConfigurationTestsIds(configuration).size();
}
}

23
src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java
View File

@@ -1,17 +1,16 @@
package _VisualDVM.ServerObjectsCache;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsJson;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup.SapforConfigurationGroup;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationSettings.SapforConfigurationSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import java.util.LinkedHashMap;
import java.util.Vector;
public class SapforConfigurationCache extends ConfigurationCache {
public SapforConfigurationCache(Configuration configuration) {
public SapforConfigurationCache(SapforConfiguration configuration) {
super(configuration);
groupsSummary = new Vector<>();
Vector<SapforConfigurationGroup> configurationGroups = Global.testingServer.db.getVectorByFK(configuration, SapforConfigurationGroup.class);
@@ -33,13 +32,15 @@ public class SapforConfigurationCache extends ConfigurationCache {
for (LanguageName language : gmap.keySet()) {
groupsSummary.add(language + ": " + String.join(";", gmap.get(language)));
}
}
public Vector<SapforSettings> getSettings() {
Vector<SapforSettings> res = new Vector<>();
for (SettingsJson settingsJson : settingsJson.array) {
if (Global.testingServer.db.sapforSettings.containsKey(settingsJson.id))
res.add(Global.testingServer.db.sapforSettings.get(settingsJson.id));
//--
Vector<SapforConfigurationSettings> configurationSettings = Global.testingServer.db.getVectorByFK(configuration, SapforConfigurationSettings.class);
Vector<String> settingsDescriptionsVector = new Vector<>();
for (SapforConfigurationSettings settings : configurationSettings) {
SapforSettings dvmSettings = Global.testingServer.db.sapforSettings.get(settings.sapforsettings_id);
settingsDescriptionsVector.add(dvmSettings.description);
}
return res;
settingsSummary = String.join(";", settingsDescriptionsVector);
//-
testsCount = Global.testingServer.db.getSapforConfigurationTestsIds(configuration).size();
}
}

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

@@ -28,7 +28,7 @@ public class VisualCaches {
}
//чтобы не трогать сами объекты и не сбить сериализацию
static VisualCache createCache(Object object) {
if (object instanceof SapforConfiguration) return new SapforConfigurationCache((Configuration) object);
if (object instanceof SapforConfiguration) return new SapforConfigurationCache((SapforConfiguration) object);
if (object instanceof DVMConfiguration) return new DVMConfigurationCache((DVMConfiguration) object);
if (object instanceof TestingPackage) return new PackageCache((TestingPackage) object);
if (object instanceof DVMSettings) return new DVMSettingsCache((DVMSettings) object);