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

This commit is contained in:
2025-03-23 16:43:19 +03:00
parent fcebae094f
commit 4f50c4a559
12 changed files with 81 additions and 4 deletions

13
.idea/workspace.xml generated
View File

@@ -7,9 +7,18 @@
</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/DVM/DVMPackageConfiguration/DVMPackageConfiguration.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfigurationsDBTable.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/1.txt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfigurationsDBTable.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/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.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/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/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.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" />

View File

@@ -26,7 +26,7 @@
"Kernels": 8, "Kernels": 8,
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe", "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
"CheckTestingIntervalSeconds": 10, "CheckTestingIntervalSeconds": 10,
"AutoCheckTesting": true, "AutoCheckTesting": false,
"EmailOnTestingProgress": true, "EmailOnTestingProgress": true,
"CompleteCompilationOptions": true, "CompleteCompilationOptions": true,
"CompleteRunEnvironments": true, "CompleteRunEnvironments": true,

View File

@@ -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";

View File

@@ -9,6 +9,7 @@ import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.DVMConfigurationsForm;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup; import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationSettings.DVMConfigurationSettings; import _VisualDVM.TestingSystem.DVM.DVMConfigurationSettings.DVMConfigurationSettings;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationTest.DVMConfigurationTest; import _VisualDVM.TestingSystem.DVM.DVMConfigurationTest.DVMConfigurationTest;
import _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration.DVMPackageConfiguration;
import javax.swing.*; import javax.swing.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@@ -34,6 +35,7 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
res.put(DVMConfigurationGroup.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE)); res.put(DVMConfigurationGroup.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
res.put(DVMConfigurationTest.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE)); res.put(DVMConfigurationTest.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
res.put(DVMConfigurationSettings.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE)); res.put(DVMConfigurationSettings.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
res.put(DVMPackageConfiguration.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
return res; return res;
} }
//-- //--

View File

@@ -1,9 +1,18 @@
package _VisualDVM.TestingSystem.DVM.DVMPackage; package _VisualDVM.TestingSystem.DVM.DVMPackage;
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.TestFile.TestFile;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationTest.DVMConfigurationTest;
import _VisualDVM.TestingSystem.DVM.DVMPackage.UI.DVMPackagesForm; import _VisualDVM.TestingSystem.DVM.DVMPackage.UI.DVMPackagesForm;
import _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration.DVMPackageConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurationTest;
import javax.swing.*; import javax.swing.*;
import java.util.LinkedHashMap;
public class DVMPackageDBTable extends iDBTable<DVMPackage> { public class DVMPackageDBTable extends iDBTable<DVMPackage> {
public DVMPackageDBTable() { public DVMPackageDBTable() {
super(DVMPackage.class); super(DVMPackage.class);
@@ -20,4 +29,10 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DVMPackagesForm(this, mountPanel); return new DVMPackagesForm(this, mountPanel);
} }
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(DVMPackageConfiguration.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
return res;
}
} }

View File

@@ -0,0 +1,7 @@
package _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration;
import Common.CommonConstants;
import Common.Database.Objects.iDBObject;
public class DVMPackageConfiguration extends iDBObject {
public int dvmpackage_id = CommonConstants.Nan;
public int dvmconfiguration_id = CommonConstants.Nan;
}

View File

@@ -0,0 +1,11 @@
package _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration;
import Common.Database.Tables.iDBTable;
public class DVMPackageConfigurationsDBTable extends iDBTable<DVMPackageConfiguration> {
public DVMPackageConfigurationsDBTable() {
super(DVMPackageConfiguration.class);
}
@Override
public boolean isEqual(DVMPackageConfiguration o1, DVMPackageConfiguration o2) {
return o1.dvmpackage_id==o2.dvmpackage_id && o1.dvmconfiguration_id==o2.dvmconfiguration_id;
}
}

View File

@@ -10,6 +10,7 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfiguratio
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup.SapforConfigurationGroup; import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup.SapforConfigurationGroup;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationSettings.SapforConfigurationSettings; import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationSettings.SapforConfigurationSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurationTest; import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurationTest;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration.SapforPackageConfiguration;
import javax.swing.*; import javax.swing.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@@ -32,6 +33,7 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
res.put(SapforConfigurationGroup.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE)); res.put(SapforConfigurationGroup.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
res.put(SapforConfigurationTest.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE)); res.put(SapforConfigurationTest.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
res.put(SapforConfigurationSettings.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE)); res.put(SapforConfigurationSettings.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
res.put(SapforPackageConfiguration.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
return res; return res;
} }
@Override @Override

View File

@@ -1,9 +1,15 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforPackage; package _VisualDVM.TestingSystem.SAPFOR.SapforPackage;
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.SAPFOR.SapforPackage.UI.SapforPackagesForm; import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI.SapforPackagesForm;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration.SapforPackageConfiguration;
import javax.swing.*; import javax.swing.*;
import java.util.LinkedHashMap;
public class SapforPackageDBTable extends iDBTable<SapforPackage> { public class SapforPackageDBTable extends iDBTable<SapforPackage> {
public SapforPackageDBTable() { public SapforPackageDBTable() {
super(SapforPackage.class); super(SapforPackage.class);
@@ -20,4 +26,10 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforPackagesForm(this, mountPanel); return new SapforPackagesForm(this, mountPanel);
} }
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(SapforPackageConfiguration.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
return res;
}
} }

View File

@@ -0,0 +1,7 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration;
import Common.CommonConstants;
import Common.Database.Objects.iDBObject;
public class SapforPackageConfiguration extends iDBObject {
public int sapforpackage_id = CommonConstants.Nan;
public int sapforconfiguration_id = CommonConstants.Nan;
}

View File

@@ -0,0 +1,12 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration;
import Common.Database.Tables.iDBTable;
import _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration.DVMPackageConfiguration;
public class SapforPackageConfigurationsDBTable extends iDBTable<SapforPackageConfiguration> {
public SapforPackageConfigurationsDBTable() {
super(SapforPackageConfiguration.class);
}
@Override
public boolean isEqual(SapforPackageConfiguration o1, SapforPackageConfiguration o2) {
return o1.sapforpackage_id==o2.sapforpackage_id && o1.sapforconfiguration_id==o2.sapforconfiguration_id;
}
}