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-25 14:09:11 +03:00
parent 7ef9ee0d5c
commit 23b143f916
9 changed files with 107 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
View File

@@ -56,7 +56,9 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration.SapforPackageConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration.SapforPackageConfigurationsDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettingsDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommandsDBTable;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
@@ -113,7 +115,7 @@ public class TestsDatabase extends SQLiteDatabase {
//--
addTable(dvmCompilationOptionsSets = new DVMCompilationOptionsSetsDBTable());
addTable(dvmCompilationOptions = new DVMCompilationOptionsDBTable());
addTable(dvmEnvironmentsSets =new DVMEnvironmentsSetsDBTable());
addTable(dvmEnvironmentsSets = new DVMEnvironmentsSetsDBTable());
addTable(dvmEnvironments = new DVMEnvironmentsDBTable());
//---
addTable(dvmConfigurations = new DVMConfigurationDBTable());
@@ -539,53 +541,68 @@ public class TestsDatabase extends SQLiteDatabase {
OptionsSetJson res = new OptionsSetJson();
if (dvmSettings_in.id != CommonConstants.Nan) {
Vector<DVMCompilationOptionsSet> optionsSets = getVectorByFK(dvmSettings_in, DVMCompilationOptionsSet.class);
for (DVMCompilationOptionsSet optionsSet: optionsSets){
for (DVMCompilationOptionsSet optionsSet : optionsSets) {
Vector<DVMCompilationOption> options = getVectorByFK(optionsSet, DVMCompilationOption.class);
OptionsJson optionsJson = new OptionsJson();
for (DVMCompilationOption option:options){
optionsJson.values.add(new OptionJson(option.name,option.value));
for (DVMCompilationOption option : options) {
optionsJson.values.add(new OptionJson(option.name, option.value));
}
res.values.add(optionsJson);
}
}
return res;
}
public void DeleteDVMSettingsOptions(DVMSettings dvmSettings) throws Exception{
public EnvironmentsSetJson convertEnvironmentsToJson(DVMSettings dvmSettings_in) {
EnvironmentsSetJson res = new EnvironmentsSetJson();
if (dvmSettings_in.id != CommonConstants.Nan) {
Vector<DVMEnvironmentsSet> environmentsSets = getVectorByFK(dvmSettings_in, DVMEnvironmentsSet.class);
for (DVMEnvironmentsSet environmentsSet : environmentsSets) {
Vector<DVMEnvironment> environments = getVectorByFK(environmentsSet, DVMEnvironment.class);
EnvironmentsJson environmentsJson = new EnvironmentsJson();
for (DVMEnvironment option : environments) {
environmentsJson.values.add(new EnvironmentJson(option.name, option.value));
}
res.values.add(environmentsJson);
}
}
return res;
}
public void DeleteDVMSettingsOptions(DVMSettings dvmSettings) throws Exception {
Vector<DVMCompilationOptionsSet> optionsSets = getVectorByFK(dvmSettings, DVMCompilationOptionsSet.class);
for (DVMCompilationOptionsSet optionsSet: optionsSets){
DeleteDependencies(optionsSet);
Delete(optionsSet);
for (DVMCompilationOptionsSet optionsSet : optionsSets) {
DeleteDependencies(optionsSet);
Delete(optionsSet);
}
}
public void InsertDVMSettingsOptions(DVMSettings dvmSettings) throws Exception{
public void InsertDVMSettingsOptions(DVMSettings dvmSettings) throws Exception {
OptionsSetJson optionsSetJson = Utils_.gson.fromJson(dvmSettings.packedCompilationOptionsJson, OptionsSetJson.class);
for (OptionsJson optionsJson: optionsSetJson.values){
for (OptionsJson optionsJson : optionsSetJson.values) {
DVMCompilationOptionsSet optionsSet = new DVMCompilationOptionsSet(dvmSettings);
Insert(optionsSet);
for (OptionJson optionJson: optionsJson.values){
for (OptionJson optionJson : optionsJson.values) {
DVMCompilationOption option = new DVMCompilationOption();
option.dvmcompilationoptionsset_id=optionsSet.id;
option.dvmcompilationoptionsset_id = optionsSet.id;
option.name = optionJson.name;
option.value = optionJson.value;
Insert(option);
}
}
}
public void DeleteDVMSettingsEnvironments(DVMSettings dvmSettings) throws Exception{
public void DeleteDVMSettingsEnvironments(DVMSettings dvmSettings) throws Exception {
Vector<DVMEnvironmentsSet> environmentsSets = getVectorByFK(dvmSettings, DVMEnvironmentsSet.class);
for (DVMEnvironmentsSet environmentsSet: environmentsSets){
for (DVMEnvironmentsSet environmentsSet : environmentsSets) {
DeleteDependencies(environmentsSet);
Delete(environmentsSet);
}
}
public void InsertDVMSettingsEnvironments(DVMSettings dvmSettings) throws Exception{
EnvironmentsSetJson environmentsSetJson = Utils_.gson.fromJson(dvmSettings.packedRunEnvironmentValuesJson, EnvironmentsSetJson.class);
for (EnvironmentsJson environmentsJson: environmentsSetJson.values){
public void InsertDVMSettingsEnvironments(DVMSettings dvmSettings) throws Exception {
EnvironmentsSetJson environmentsSetJson = Utils_.gson.fromJson(dvmSettings.packedRunEnvironmentValuesJson, EnvironmentsSetJson.class);
for (EnvironmentsJson environmentsJson : environmentsSetJson.values) {
DVMEnvironmentsSet environmentsSet = new DVMEnvironmentsSet(dvmSettings);
Insert(environmentsSet);
for (EnvironmentJson environmentJson: environmentsJson.values){
for (EnvironmentJson environmentJson : environmentsJson.values) {
DVMEnvironment environment = new DVMEnvironment();
environment.dvmenvironmentsset_id=environmentsSet.id;
environment.dvmenvironmentsset_id = environmentsSet.id;
environment.name = environmentJson.name;
environment.value = environmentJson.value;
Insert(environment);
@@ -593,6 +610,51 @@ public class TestsDatabase extends SQLiteDatabase {
}
}
//--
public void CloneDVMSettings(DVMSettings dvmSettings_src, DVMSettings dvmSettings_dst) throws Exception {
//--
Vector<DVMCompilationOptionsSet> optionsSets_src = getVectorByFK(dvmSettings_src, DVMCompilationOptionsSet.class);
for (DVMCompilationOptionsSet optionsSet_src : optionsSets_src) {
DVMCompilationOptionsSet optionsSet_dst = new DVMCompilationOptionsSet(dvmSettings_dst);
Insert(optionsSet_dst);
//--
Vector<DVMCompilationOption> options_src = getVectorByFK(optionsSet_src, DVMCompilationOption.class);
Vector<DVMCompilationOption> options_dst = new Vector<>();
//--
for (DVMCompilationOption option_src : options_src) {
DVMCompilationOption option_dst = new DVMCompilationOption();
option_dst.dvmcompilationoptionsset_id = optionsSet_dst.id;
option_dst.name = option_src.name;
option_dst.value = option_src.value;
Insert(option_dst);
}
}
//--
Vector<DVMEnvironmentsSet> environmentsSets_src = getVectorByFK(dvmSettings_src, DVMEnvironmentsSet.class);
for (DVMEnvironmentsSet environmentsSet_src : environmentsSets_src) {
DVMEnvironmentsSet environmentsSet_dst = new DVMEnvironmentsSet(dvmSettings_dst);
Insert(environmentsSet_dst);
//--
Vector<DVMEnvironment> environments_src = getVectorByFK(environmentsSet_src, DVMEnvironment.class);
Vector<DVMEnvironment> environments_dst = new Vector<>();
//--
for (DVMEnvironment environment_src : environments_src) {
DVMEnvironment environment_dst = new DVMEnvironment();
environment_dst.dvmenvironmentsset_id = environmentsSet_dst.id;
environment_dst.name = environment_src.name;
environment_dst.value = environment_src.value;
Insert(environment_dst);
}
}
}
public void CloneSapforSettings(SapforSettings src, SapforSettings dst) throws Exception {
for (SapforSettingsCommand src_command : getVectorByFK(src, SapforSettingsCommand.class)) {
SapforSettingsCommand dst_command = new SapforSettingsCommand();
dst_command.sapforsettings_id = dst.id;
dst_command.passCode = src_command.passCode;
Insert(dst_command);
}
}
//--
public void Patch() throws Exception {
/*
Vector<DVMCompilationOptionsSet> sets = new Vector<>();
@@ -641,17 +703,16 @@ public class TestsDatabase extends SQLiteDatabase {
}
Commit();
*/
}
public static String printOptionsLine(Vector<DVMCompilationOption> options){
}
public static String printOptionsLine(Vector<DVMCompilationOption> options) {
Vector<String> res = new Vector<>();
for (DVMCompilationOption option: options)
for (DVMCompilationOption option : options)
res.add(option.print());
return String.join(" ", res);
}
public static String printEnvironmentsLine(Vector<DVMEnvironment> environments){
public static String printEnvironmentsLine(Vector<DVMEnvironment> environments) {
Vector<String> res = new Vector<>();
for (DVMEnvironment environment: environments)
for (DVMEnvironment environment : environments)
res.add(environment.print());
return String.join(" ", res);
}
@@ -664,7 +725,6 @@ public class TestsDatabase extends SQLiteDatabase {
for (int i = 0; i < optionsSets.size(); ++i) {
Vector<DVMCompilationOption> options = getVectorByFK(optionsSets.get(i), DVMCompilationOption.class);
Vector<DVMEnvironment> environments = getVectorByFK(environmentsSets.get(i), DVMEnvironment.class);
String optionsLine = printOptionsLine(options);
String environmentsLine = (i < environmentsSets.size()) ? printEnvironmentsLine(environments) : "";
res.add(new Pair<>(
@@ -681,19 +741,4 @@ public class TestsDatabase extends SQLiteDatabase {
}
return res;
}
public EnvironmentsSetJson convertEnvironmentsToJson(DVMSettings dvmSettings_in) {
EnvironmentsSetJson res = new EnvironmentsSetJson();
if (dvmSettings_in.id != CommonConstants.Nan) {
Vector<DVMEnvironmentsSet> environmentsSets = getVectorByFK(dvmSettings_in, DVMEnvironmentsSet.class);
for (DVMEnvironmentsSet environmentsSet: environmentsSets){
Vector<DVMEnvironment> environments = getVectorByFK(environmentsSet, DVMEnvironment.class);
EnvironmentsJson environmentsJson = new EnvironmentsJson();
for (DVMEnvironment option:environments){
environmentsJson.values.add(new EnvironmentJson(option.name,option.value));
}
res.values.add(environmentsJson);
}
}
return res;
}
}