From 4f50c4a559392a8f5e51d35330e14b0c7fe385ec Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 23 Mar 2025 16:43:19 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D0=BD=D0=B0=D1=87?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=BE=20=D0=B2=D0=B2=D0=BE=D0=B4=D0=B0=20=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B4=D0=B5=D0=BA=D1=81=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F?=
 =?UTF-8?q?=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                               | 13 +++++++++++--
 properties                                        |  2 +-
 src/_VisualDVM/Constants.java                     |  2 +-
 .../DVMConfiguration/DVMConfigurationDBTable.java |  2 ++
 .../DVM/DVMPackage/DVMPackageDBTable.java         | 15 +++++++++++++++
 .../DVMPackageConfiguration.java                  |  7 +++++++
 .../DVMPackageConfigurationsDBTable.java          | 11 +++++++++++
 .../SapforConfigurationDBTable.java               |  2 ++
 .../SapforPackage/SapforPackageDBTable.java       | 12 ++++++++++++
 .../SAPFOR/SapforPackageConfiguration/1.txt       |  0
 .../SapforPackageConfiguration.java               |  7 +++++++
 .../SapforPackageConfigurationsDBTable.java       | 12 ++++++++++++
 12 files changed, 81 insertions(+), 4 deletions(-)
 create mode 100644 src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfiguration.java
 create mode 100644 src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfigurationsDBTable.java
 create mode 100644 src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/1.txt
 create mode 100644 src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java
 create mode 100644 src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfigurationsDBTable.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5e9cf71e..91b5f5fc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,18 @@
   </component>
   <component name="ChangeListManager">
     <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$/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$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 4a53cecb..6ef9034b 100644
--- a/properties
+++ b/properties
@@ -26,7 +26,7 @@
   "Kernels": 8,
   "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
   "CheckTestingIntervalSeconds": 10,
-  "AutoCheckTesting": true,
+  "AutoCheckTesting": false,
   "EmailOnTestingProgress": true,
   "CompleteCompilationOptions": true,
   "CompleteRunEnvironments": true,
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index eff503ee..3e618805 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -48,7 +48,7 @@ public class Constants {
     //
     //7998 отладочный порт. теперь.
     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 String ServerAddress = "alex-freenas.ddns.net";
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
index 66d0c8af..f3bebe7b 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
@@ -9,6 +9,7 @@ import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.DVMConfigurationsForm;
 import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
 import _VisualDVM.TestingSystem.DVM.DVMConfigurationSettings.DVMConfigurationSettings;
 import _VisualDVM.TestingSystem.DVM.DVMConfigurationTest.DVMConfigurationTest;
+import _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration.DVMPackageConfiguration;
 
 import javax.swing.*;
 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(DVMConfigurationTest.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;
     }
     //--
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index b4e42d0a..92c9a178 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -1,9 +1,18 @@
 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.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.DVMPackageConfiguration.DVMPackageConfiguration;
+import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurationTest;
 
 import javax.swing.*;
+import java.util.LinkedHashMap;
 public class DVMPackageDBTable extends iDBTable<DVMPackage> {
     public DVMPackageDBTable() {
         super(DVMPackage.class);
@@ -20,4 +29,10 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
     protected DataSetControlForm createUI(JPanel 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;
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfiguration.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfiguration.java
new file mode 100644
index 00000000..abb8301a
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfiguration.java
@@ -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;
+}
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfigurationsDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfigurationsDBTable.java
new file mode 100644
index 00000000..aa34cde7
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfigurationsDBTable.java
@@ -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;
+    }
+}
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
index 74855250..38e3a59e 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
@@ -10,6 +10,7 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfiguratio
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup.SapforConfigurationGroup;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationSettings.SapforConfigurationSettings;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurationTest;
+import _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration.SapforPackageConfiguration;
 
 import javax.swing.*;
 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(SapforConfigurationTest.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;
     }
     @Override
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
index 2d3a1163..e23797b7 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
@@ -1,9 +1,15 @@
 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.Visual.DataSetControlForm;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI.SapforPackagesForm;
+import _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration.SapforPackageConfiguration;
 
 import javax.swing.*;
+import java.util.LinkedHashMap;
 public class SapforPackageDBTable extends iDBTable<SapforPackage> {
     public SapforPackageDBTable() {
         super(SapforPackage.class);
@@ -20,4 +26,10 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
     protected DataSetControlForm createUI(JPanel 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;
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/1.txt b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/1.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java
new file mode 100644
index 00000000..e7bbaf17
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java
@@ -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;
+}
\ No newline at end of file
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfigurationsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfigurationsDBTable.java
new file mode 100644
index 00000000..4ea139e2
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfigurationsDBTable.java
@@ -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;
+    }
+}