no message
This commit is contained in:
13
.idea/workspace.xml
generated
13
.idea/workspace.xml
generated
@@ -7,10 +7,19 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationGroup/SapforConfigurationGroup.java" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationGroup/SapforConfigurationGroupsDBTable.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroup.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroupsDBTable.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ public class Constants {
|
|||||||
//
|
//
|
||||||
//7998 отладочный порт. теперь.
|
//7998 отладочный порт. теперь.
|
||||||
public static final int ComponentsServerPort = 7995; //7795
|
public static final int ComponentsServerPort = 7995; //7795
|
||||||
public static final int TestingServerPort = 7996; //7996
|
public static final int TestingServerPort = 7998; //7996
|
||||||
public static final int SocketTimeout = 0;
|
public static final int SocketTimeout = 0;
|
||||||
//-
|
//-
|
||||||
public static final String ServerAddress = "alex-freenas.ddns.net";
|
public static final String ServerAddress = "alex-freenas.ddns.net";
|
||||||
|
|||||||
@@ -62,7 +62,6 @@ public class Configuration extends riDBObject {
|
|||||||
}
|
}
|
||||||
//--
|
//--
|
||||||
public void saveGroupsAsJson(Vector<Group> groups) {
|
public void saveGroupsAsJson(Vector<Group> groups) {
|
||||||
packedGroupsJson = Utils_.gson.toJson(new GroupsJson(groups));
|
|
||||||
}
|
}
|
||||||
public void saveTestsAsJson(Vector<Test> tests) {
|
public void saveTestsAsJson(Vector<Test> tests) {
|
||||||
packedTestsJson = Utils_.gson.toJson(new TestsJson(tests));
|
packedTestsJson = Utils_.gson.toJson(new TestsJson(tests));
|
||||||
@@ -82,7 +81,7 @@ public class Configuration extends riDBObject {
|
|||||||
kernels = c.kernels;
|
kernels = c.kernels;
|
||||||
groupsOnly = c.groupsOnly;
|
groupsOnly = c.groupsOnly;
|
||||||
//-
|
//-
|
||||||
packedGroupsJson = c.packedGroupsJson;
|
// packedGroupsJson = c.packedGroupsJson;
|
||||||
packedTestsJson = c.packedTestsJson;
|
packedTestsJson = c.packedTestsJson;
|
||||||
packedSettingsJson = c.packedSettingsJson;
|
packedSettingsJson = c.packedSettingsJson;
|
||||||
}
|
}
|
||||||
@@ -101,7 +100,7 @@ public class Configuration extends riDBObject {
|
|||||||
if (groupJson.id == group.id) {
|
if (groupJson.id == group.id) {
|
||||||
groupJson.description = group.description;
|
groupJson.description = group.description;
|
||||||
groupJson.language = String.valueOf(group.language);
|
groupJson.language = String.valueOf(group.language);
|
||||||
packedGroupsJson = Utils_.gson.toJson(unpacked.groupsJson);
|
// packedGroupsJson = Utils_.gson.toJson(unpacked.groupsJson);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -118,7 +117,7 @@ public class Configuration extends riDBObject {
|
|||||||
}
|
}
|
||||||
if (flag) {
|
if (flag) {
|
||||||
unpacked.groupsJson.array = actualGroups;
|
unpacked.groupsJson.array = actualGroups;
|
||||||
packedGroupsJson = Utils_.gson.toJson(unpacked.groupsJson);
|
// packedGroupsJson = Utils_.gson.toJson(unpacked.groupsJson);
|
||||||
}
|
}
|
||||||
return flag;
|
return flag;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import _VisualDVM.Constants;
|
|||||||
import _VisualDVM.ProjectData.LanguageName;
|
import _VisualDVM.ProjectData.LanguageName;
|
||||||
import _VisualDVM.TestingSystem.Common.Group.UI.GroupsForm;
|
import _VisualDVM.TestingSystem.Common.Group.UI.GroupsForm;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||||
|
import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
|
||||||
|
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup.SapforConfigurationGroup;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
@@ -30,6 +32,8 @@ public class GroupsDBTable extends iDBTable<Group> {
|
|||||||
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
|
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
|
||||||
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
|
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
|
||||||
res.put(Test.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
|
res.put(Test.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
|
||||||
|
res.put(DVMConfigurationGroup.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
|
||||||
|
res.put(SapforConfigurationGroup.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
public void StartAction() throws Exception {
|
public void StartAction() throws Exception {
|
||||||
try {
|
try {
|
||||||
//--
|
//--
|
||||||
// db.Patch();
|
db.Patch();
|
||||||
//--
|
//--
|
||||||
machines_db = new MachinesDatabase();
|
machines_db = new MachinesDatabase();
|
||||||
machines_db.Activate();
|
machines_db.Activate();
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ import _VisualDVM.Passes.PassCode;
|
|||||||
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||||
import _VisualDVM.TestingSystem.Common.Group.Group;
|
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||||
import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
|
import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.Json.TestFileJson;
|
import _VisualDVM.TestingSystem.Common.Group.Json.GroupJson;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.Json.TestFilesJson;
|
import _VisualDVM.TestingSystem.Common.Group.Json.GroupsJson;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.TestDBTable;
|
import _VisualDVM.TestingSystem.Common.Test.TestDBTable;
|
||||||
import _VisualDVM.TestingSystem.Common.TestFile.TestFile;
|
import _VisualDVM.TestingSystem.Common.TestFile.TestFile;
|
||||||
@@ -19,10 +19,14 @@ import _VisualDVM.TestingSystem.Common.TestFile.TestFilesDBTable;
|
|||||||
import _VisualDVM.TestingSystem.Common.TestingPackageToKill.TestingPackagesToKillDBTable;
|
import _VisualDVM.TestingSystem.Common.TestingPackageToKill.TestingPackagesToKillDBTable;
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfigurationDBTable;
|
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfigurationDBTable;
|
||||||
|
import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
|
||||||
|
import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroupsDBTable;
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
|
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
|
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettingsDBTable;
|
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettingsDBTable;
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTasksSet;
|
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTasksSet;
|
||||||
|
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup.SapforConfigurationGroup;
|
||||||
|
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup.SapforConfigurationGroupsDBTable;
|
||||||
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
|
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
|
||||||
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
|
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
|
||||||
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
|
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
|
||||||
@@ -41,42 +45,48 @@ import java.util.Comparator;
|
|||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class TestsDatabase extends SQLiteDatabase {
|
public class TestsDatabase extends SQLiteDatabase {
|
||||||
public DVMConfigurationDBTable dvmConfigurations;
|
public GroupsDBTable groups;
|
||||||
|
//--
|
||||||
public TestDBTable tests;
|
public TestDBTable tests;
|
||||||
public TestFilesDBTable testsFiles;
|
public TestFilesDBTable testsFiles;
|
||||||
public GroupsDBTable groups;
|
//---
|
||||||
|
public DVMSettingsDBTable dvmSettings;
|
||||||
|
public DVMConfigurationDBTable dvmConfigurations;
|
||||||
|
public DVMConfigurationGroupsDBTable dvmConfigurationGroups;
|
||||||
public DVMPackageDBTable dvmPackages;
|
public DVMPackageDBTable dvmPackages;
|
||||||
|
public DVMRunTasksSet dvmRunTasks = new DVMRunTasksSet();
|
||||||
|
//--
|
||||||
|
public ServerSapforsDBTable serverSapfors;
|
||||||
|
public SapforSettingsDBTable sapforSettings;
|
||||||
|
public SapforSettingsCommandsDBTable sapforSettingsCommands;
|
||||||
|
public SapforConfigurationDBTable sapforConfigurations;
|
||||||
|
public SapforConfigurationGroupsDBTable sapforConfigurationsGroups;
|
||||||
public SapforPackageDBTable sapforPackages;
|
public SapforPackageDBTable sapforPackages;
|
||||||
//--
|
//--
|
||||||
public TestingPackagesToKillDBTable testingPackagesToKill;
|
public TestingPackagesToKillDBTable testingPackagesToKill;
|
||||||
//--
|
//--
|
||||||
public SapforConfigurationDBTable sapforConfigurations;
|
|
||||||
//----
|
|
||||||
public ServerSapforsDBTable serverSapfors;
|
|
||||||
//---
|
|
||||||
public DVMRunTasksSet dvmRunTasks = new DVMRunTasksSet(); //задачи текущего пакета тестирования DVM
|
|
||||||
public SapforSettingsDBTable sapforSettings;
|
|
||||||
public SapforSettingsCommandsDBTable sapforSettingsCommands;
|
|
||||||
//--
|
|
||||||
public DVMSettingsDBTable dvmSettings;
|
|
||||||
public TestsDatabase() {
|
public TestsDatabase() {
|
||||||
super(Paths.get(System.getProperty("user.dir"), "Data", Constants.tests_db_name + ".sqlite").toFile());
|
super(Paths.get(System.getProperty("user.dir"), "Data", Constants.tests_db_name + ".sqlite").toFile());
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void initAllTables() throws Exception {
|
protected void initAllTables() throws Exception {
|
||||||
addTable(dvmConfigurations = new DVMConfigurationDBTable());
|
|
||||||
addTable(groups = new GroupsDBTable());
|
addTable(groups = new GroupsDBTable());
|
||||||
addTable(tests = new TestDBTable());
|
addTable(tests = new TestDBTable());
|
||||||
addTable(testsFiles = new TestFilesDBTable());
|
addTable(testsFiles = new TestFilesDBTable());
|
||||||
|
//--
|
||||||
|
addTable(dvmSettings = new DVMSettingsDBTable());
|
||||||
|
addTable(dvmConfigurations = new DVMConfigurationDBTable());
|
||||||
|
addTable(dvmConfigurationGroups = new DVMConfigurationGroupsDBTable());
|
||||||
addTable(dvmPackages = new DVMPackageDBTable());
|
addTable(dvmPackages = new DVMPackageDBTable());
|
||||||
addTable(sapforPackages = new SapforPackageDBTable());
|
|
||||||
addTable(testingPackagesToKill = new TestingPackagesToKillDBTable());
|
|
||||||
//-
|
//-
|
||||||
addTable(sapforConfigurations = new SapforConfigurationDBTable());
|
|
||||||
addTable(serverSapfors = new ServerSapforsDBTable());
|
addTable(serverSapfors = new ServerSapforsDBTable());
|
||||||
addTable(sapforSettings = new SapforSettingsDBTable());
|
addTable(sapforSettings = new SapforSettingsDBTable());
|
||||||
addTable(sapforSettingsCommands = new SapforSettingsCommandsDBTable());
|
addTable(sapforSettingsCommands = new SapforSettingsCommandsDBTable());
|
||||||
addTable(dvmSettings = new DVMSettingsDBTable());
|
addTable(sapforConfigurations = new SapforConfigurationDBTable());
|
||||||
|
addTable(sapforConfigurationsGroups = new SapforConfigurationGroupsDBTable());
|
||||||
|
addTable(sapforPackages = new SapforPackageDBTable());
|
||||||
|
//--
|
||||||
|
addTable(testingPackagesToKill = new TestingPackagesToKillDBTable());
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public PassCode getSynchronizePassCode() {
|
public PassCode getSynchronizePassCode() {
|
||||||
@@ -359,27 +369,39 @@ public class TestsDatabase extends SQLiteDatabase {
|
|||||||
Delete(file);
|
Delete(file);
|
||||||
}
|
}
|
||||||
public void Patch() throws Exception{
|
public void Patch() throws Exception{
|
||||||
//файлы тестов.
|
|
||||||
/*
|
/*
|
||||||
Vector<TestFile> testFiles = new Vector<>();
|
Vector<DVMConfigurationGroup> DVMConfigurationGroups=new Vector<>();
|
||||||
for (Test test:tests.Data.values()){
|
//группы dvm конфигураций
|
||||||
TestFilesJson json = Utils_.gson.fromJson(test.packedFilesJson, TestFilesJson.class);
|
for (DVMConfiguration dvmConfiguration: dvmConfigurations.Data.values()){
|
||||||
for (TestFileJson testFileJson: json.values){
|
GroupsJson groupsJson = Utils_.gson.fromJson(dvmConfiguration.packedGroupsJson, GroupsJson.class);
|
||||||
TestFile testFile = new TestFile();
|
for (GroupJson groupJson: groupsJson.array){
|
||||||
//-
|
DVMConfigurationGroup dvmConfigurationGroup = new DVMConfigurationGroup();
|
||||||
testFile.test_id = test.id;
|
dvmConfigurationGroup.group_id = groupJson.id;
|
||||||
testFile.name = testFileJson.name;
|
dvmConfigurationGroup.dvmconfiguration_id = dvmConfiguration.id;
|
||||||
testFile.style = testFileJson.style;
|
DVMConfigurationGroups.add(dvmConfigurationGroup);
|
||||||
testFile.languageName = testFileJson.language;
|
|
||||||
testFile.fileType= testFileJson.type;
|
|
||||||
//--
|
|
||||||
testFiles.add(testFile);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
BeginTransaction();
|
BeginTransaction();
|
||||||
for (TestFile testFile: testFiles){
|
for (DVMConfigurationGroup dvmConfigurationGroup: DVMConfigurationGroups)
|
||||||
Insert(testFile);
|
Insert(dvmConfigurationGroup);
|
||||||
|
Commit();
|
||||||
|
*/
|
||||||
|
//---
|
||||||
|
/*
|
||||||
|
Vector<SapforConfigurationGroup> sapforConfigurationGroups =new Vector<>();
|
||||||
|
//группы sapfor конфигураций
|
||||||
|
for (SapforConfiguration sapforConfiguration: sapforConfigurations.Data.values()){
|
||||||
|
GroupsJson groupsJson = Utils_.gson.fromJson(sapforConfiguration.packedGroupsJson, GroupsJson.class);
|
||||||
|
for (GroupJson groupJson: groupsJson.array){
|
||||||
|
SapforConfigurationGroup sapforConfigurationGroup = new SapforConfigurationGroup();
|
||||||
|
sapforConfigurationGroup.group_id = groupJson.id;
|
||||||
|
sapforConfigurationGroup.sapforconfiguration_id = sapforConfiguration.id;
|
||||||
|
sapforConfigurationGroups.add(sapforConfigurationGroup);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
BeginTransaction();
|
||||||
|
for (SapforConfigurationGroup sapforConfigurationGroup: sapforConfigurationGroups)
|
||||||
|
Insert(sapforConfigurationGroup);
|
||||||
Commit();
|
Commit();
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,12 @@
|
|||||||
package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
|
package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
|
||||||
import Common.Database.Objects.DBObject;
|
import Common.Database.Objects.DBObject;
|
||||||
|
import Common.Utils.Utils_;
|
||||||
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
|
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
|
||||||
|
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||||
|
import _VisualDVM.TestingSystem.Common.Group.Json.GroupsJson;
|
||||||
|
import com.sun.org.glassfish.gmbal.Description;
|
||||||
|
|
||||||
|
import java.util.Vector;
|
||||||
//конфгурация тестирования ДВМ
|
//конфгурация тестирования ДВМ
|
||||||
public class DVMConfiguration extends Configuration {
|
public class DVMConfiguration extends Configuration {
|
||||||
public int c_maxtime = 40;
|
public int c_maxtime = 40;
|
||||||
@@ -14,5 +20,10 @@ public class DVMConfiguration extends Configuration {
|
|||||||
super.SynchronizeFields(src);
|
super.SynchronizeFields(src);
|
||||||
DVMConfiguration c = (DVMConfiguration) src;
|
DVMConfiguration c = (DVMConfiguration) src;
|
||||||
c_maxtime = c.c_maxtime;
|
c_maxtime = c.c_maxtime;
|
||||||
|
packedGroupsJson = c.packedGroupsJson;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void saveGroupsAsJson(Vector<Group> groups) {
|
||||||
|
packedGroupsJson = Utils_.gson.toJson(new GroupsJson(groups));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,16 @@
|
|||||||
package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
|
package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
|
||||||
|
import Common.Database.Objects.DBObject;
|
||||||
|
import Common.Database.Tables.FKBehaviour;
|
||||||
|
import Common.Database.Tables.FKCurrentObjectBehaviuor;
|
||||||
|
import Common.Database.Tables.FKDataBehaviour;
|
||||||
import Common.Database.Tables.iDBTable;
|
import Common.Database.Tables.iDBTable;
|
||||||
import Common.Visual.DataSetControlForm;
|
import Common.Visual.DataSetControlForm;
|
||||||
|
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.DVMConfigurationsForm;
|
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.DVMConfigurationsForm;
|
||||||
|
import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
|
public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
|
||||||
public DVMConfigurationDBTable() {
|
public DVMConfigurationDBTable() {
|
||||||
super(DVMConfiguration.class);
|
super(DVMConfiguration.class);
|
||||||
@@ -20,4 +27,10 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
|
|||||||
protected DataSetControlForm createUI(JPanel mountPanel) {
|
protected DataSetControlForm createUI(JPanel mountPanel) {
|
||||||
return new DVMConfigurationsForm(this, mountPanel);
|
return new DVMConfigurationsForm(this, mountPanel);
|
||||||
}
|
}
|
||||||
|
@Override
|
||||||
|
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
|
||||||
|
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
|
||||||
|
res.put(DVMConfigurationGroup.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
|
||||||
|
return res;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,15 @@
|
|||||||
package _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup;
|
package _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup;
|
||||||
|
import Common.CommonConstants;
|
||||||
|
import Common.Database.Objects.DBObject;
|
||||||
import Common.Database.Objects.iDBObject;
|
import Common.Database.Objects.iDBObject;
|
||||||
public class DVMConfigurationGroup extends iDBObject {
|
public class DVMConfigurationGroup extends iDBObject {
|
||||||
|
public int dvmconfiguration_id = CommonConstants.Nan;
|
||||||
|
public int group_id = CommonConstants.Nan;
|
||||||
|
@Override
|
||||||
|
public void SynchronizeFields(DBObject src) {
|
||||||
|
super.SynchronizeFields(src);
|
||||||
|
DVMConfigurationGroup src_ = (DVMConfigurationGroup) src;
|
||||||
|
dvmconfiguration_id = src_.dvmconfiguration_id;
|
||||||
|
group_id = src_.group_id;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
package _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup;
|
package _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup;
|
||||||
public class DVMConfigurationGroupsDBTable {
|
import Common.Database.Tables.iDBTable;
|
||||||
|
public class DVMConfigurationGroupsDBTable extends iDBTable<DVMConfigurationGroup> {
|
||||||
|
public DVMConfigurationGroupsDBTable() {
|
||||||
|
super(DVMConfigurationGroup.class);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +1,31 @@
|
|||||||
package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
|
package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
|
||||||
|
import Common.Database.Objects.DBObject;
|
||||||
import Common.Utils.TextLog;
|
import Common.Utils.TextLog;
|
||||||
|
import Common.Utils.Utils_;
|
||||||
import _VisualDVM.ProjectData.LanguageName;
|
import _VisualDVM.ProjectData.LanguageName;
|
||||||
import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
|
import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
|
||||||
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||||
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
|
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
|
||||||
import _VisualDVM.TestingSystem.Common.Group.Group;
|
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||||
|
import _VisualDVM.TestingSystem.Common.Group.Json.GroupsJson;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||||
|
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
||||||
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
|
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
|
||||||
|
import com.sun.org.glassfish.gmbal.Description;
|
||||||
|
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class SapforConfiguration extends Configuration {
|
public class SapforConfiguration extends Configuration {
|
||||||
|
@Override
|
||||||
|
public void saveGroupsAsJson(Vector<Group> groups) {
|
||||||
|
packedGroupsJson = Utils_.gson.toJson(new GroupsJson(groups));
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void SynchronizeFields(DBObject src) {
|
||||||
|
super.SynchronizeFields(src);
|
||||||
|
SapforConfiguration c = (SapforConfiguration) src;
|
||||||
|
packedGroupsJson = c.packedGroupsJson;
|
||||||
|
}
|
||||||
public SapforConfiguration(SapforConfiguration sapforConfiguration) {
|
public SapforConfiguration(SapforConfiguration sapforConfiguration) {
|
||||||
this.SynchronizeFields(sapforConfiguration);
|
this.SynchronizeFields(sapforConfiguration);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,18 @@
|
|||||||
package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
|
package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
|
||||||
|
import Common.Database.Objects.DBObject;
|
||||||
|
import Common.Database.Tables.FKBehaviour;
|
||||||
|
import Common.Database.Tables.FKCurrentObjectBehaviuor;
|
||||||
|
import Common.Database.Tables.FKDataBehaviour;
|
||||||
import Common.Database.Tables.iDBTable;
|
import Common.Database.Tables.iDBTable;
|
||||||
import Common.Utils.Vector_;
|
import Common.Utils.Vector_;
|
||||||
import Common.Visual.DataSetControlForm;
|
import Common.Visual.DataSetControlForm;
|
||||||
|
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||||
|
import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
|
||||||
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationsForm;
|
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationsForm;
|
||||||
|
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup.SapforConfigurationGroup;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
|
public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
|
||||||
public SapforConfigurationDBTable() {
|
public SapforConfigurationDBTable() {
|
||||||
@@ -19,6 +27,12 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
|
|||||||
return "конфигурации";
|
return "конфигурации";
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
|
||||||
|
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
|
||||||
|
res.put(SapforConfigurationGroup.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
protected DataSetControlForm createUI(JPanel mountPanel) {
|
protected DataSetControlForm createUI(JPanel mountPanel) {
|
||||||
return new SapforConfigurationsForm(this, mountPanel);
|
return new SapforConfigurationsForm(this, mountPanel);
|
||||||
}
|
}
|
||||||
@@ -37,4 +51,5 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
|
|||||||
return sapforConfiguration;
|
return sapforConfiguration;
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup;
|
||||||
|
import Common.CommonConstants;
|
||||||
|
import Common.Database.Objects.DBObject;
|
||||||
|
import Common.Database.Objects.iDBObject;
|
||||||
|
public class SapforConfigurationGroup extends iDBObject {
|
||||||
|
public int sapforconfiguration_id = CommonConstants.Nan;
|
||||||
|
public int group_id = CommonConstants.Nan;
|
||||||
|
@Override
|
||||||
|
public void SynchronizeFields(DBObject src) {
|
||||||
|
super.SynchronizeFields(src);
|
||||||
|
SapforConfigurationGroup src_ = (SapforConfigurationGroup) src;
|
||||||
|
sapforconfiguration_id = src_.sapforconfiguration_id;
|
||||||
|
group_id = src_.group_id;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
package _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup;
|
||||||
|
import Common.Database.Tables.iDBTable;
|
||||||
|
public class SapforConfigurationGroupsDBTable extends iDBTable<SapforConfigurationGroup> {
|
||||||
|
public SapforConfigurationGroupsDBTable() {
|
||||||
|
super(SapforConfigurationGroup.class);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Reference in New Issue
Block a user