From d3fc9a8f8e79157cb54f97df632756523102ce66 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 17 Nov 2023 22:03:13 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 14 +++--
 src/TestingSystem/Common/TestingServer.java   |  2 +-
 .../SAPFOR/Json/SapforConfiguration_json.java |  3 +-
 .../SAPFOR/Json/SapforTasksResults_json.java  | 44 +++++++--------
 .../SAPFOR/PackageModeSupervisor.java         |  2 +-
 .../SAPFOR/PerformSapforTask.java             |  4 +-
 .../SAPFOR/SapforTask/SapforTask.java         | 12 ++---
 .../SapforTasksPackage.java                   | 54 ++++++++++---------
 .../SapforTasksPackagesDBTable.java           |  4 +-
 .../UI/ConfigurationSummary.java              |  5 +-
 .../SapforTasksPackageSupervisor.java         |  2 +-
 .../Passes/All/AbortSapforTaskPackage.java    |  2 +-
 .../All/DownloadSapforTasksPackage.java       |  2 +-
 .../Passes/All/StartSapforTests.java          |  2 +-
 .../UI/Main/SapforPackageFields.java          |  2 +-
 .../UI/Main/SapforPackageForm.java            |  2 +-
 16 files changed, 86 insertions(+), 70 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2b75c1f9..04bdabe7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommand.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.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/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTasksResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTasksResults_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/ConfigurationSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/ConfigurationSummary.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index 2e70ba1e..3191ed31 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -154,7 +154,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
             //внешние ключи не работают
             Vector<SapforTask> tasks = new Vector<>();
             for (SapforTask task : account_db.sapforTasks.Data.values()) {
-                if (task.sapfortaskspackage_id.equals(sapforTasksPackage.id)) // todo group_name -> group_id
+                if (task.sapfortaskspackage_id==sapforTasksPackage.id) // todo group_name -> group_id
                     tasks.add(task);
             }
             for (SapforTask task : tasks) {
diff --git a/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java b/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java
index 0a57ed0e..450cea68 100644
--- a/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java
@@ -1,4 +1,5 @@
 package TestingSystem.SAPFOR.Json;
+import Common.Constants;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.google.gson.annotations.Expose;
 
@@ -6,7 +7,7 @@ import java.util.List;
 import java.util.Vector;
 public class SapforConfiguration_json {
     @Expose
-    public String id = "";
+    public int id = Constants.Nan;
     @Expose
     public String flags = "";
     @Expose
diff --git a/src/TestingSystem/SAPFOR/Json/SapforTasksResults_json.java b/src/TestingSystem/SAPFOR/Json/SapforTasksResults_json.java
index 3705cb72..fd1a463a 100644
--- a/src/TestingSystem/SAPFOR/Json/SapforTasksResults_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforTasksResults_json.java
@@ -26,9 +26,9 @@ public class SapforTasksResults_json {
     public List<SapforTask> tasks = new Vector<>();
     //все задачи по ключам.
     public LinkedHashMap<String, SapforTask> allTasks = new LinkedHashMap<>();
-    public LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = new LinkedHashMap<>();
+    public LinkedHashMap<TaskState, LinkedHashMap<Integer, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = new LinkedHashMap<>();
     //-- задачи, отсортированные для сравнения.
-    public LinkedHashMap<MatchState, LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>>> comparisonSortedTasks = new LinkedHashMap<>();
+    public LinkedHashMap<MatchState, LinkedHashMap<TaskState, LinkedHashMap<Integer, LinkedHashMap<String, Vector<SapforTask>>>>> comparisonSortedTasks = new LinkedHashMap<>();
     //----
     public void buildTree(SapforTasksPackage package_in) {
         root = new PackageSummary();
@@ -37,8 +37,8 @@ public class SapforTasksResults_json {
             //--
             StateSummary stateSummary = new StateSummary(state);
             //--
-            LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = sortedTasks.get(state);
-            for (String configuration_id : tasksByConfigurations.keySet()) {
+            LinkedHashMap<Integer, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = sortedTasks.get(state);
+            for (int configuration_id : tasksByConfigurations.keySet()) {
                 //--
                 DefaultMutableTreeNode configurationNode = null;
                 //--
@@ -56,7 +56,7 @@ public class SapforTasksResults_json {
                             configurationNode = new ConfigurationSummary(configuration_id, task);
                         }
                         //--
-                        groupSummary.add(task.getVersionsTree(new File(package_in.getLocalWorkspace(), configuration_id)));
+                        groupSummary.add(task.getVersionsTree(new File(package_in.getLocalWorkspace(), String.valueOf(configuration_id))));
                     }
                     if (configurationNode != null)
                         configurationNode.add(groupSummary);
@@ -74,14 +74,14 @@ public class SapforTasksResults_json {
             //--
             MatchesSummary matchesSummary = new MatchesSummary(match_state);
             //---
-            LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> task_states = comparisonSortedTasks.get(match_state);
+            LinkedHashMap<TaskState, LinkedHashMap<Integer, LinkedHashMap<String, Vector<SapforTask>>>> task_states = comparisonSortedTasks.get(match_state);
             //---
             for (TaskState state : task_states.keySet()) {
                 //--
                 StateSummary stateSummary = new StateSummary(state);
                 //--
-                LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = task_states.get(state);
-                for (String configuration_id : tasksByConfigurations.keySet()) {
+                LinkedHashMap<Integer, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = task_states.get(state);
+                for (int configuration_id : tasksByConfigurations.keySet()) {
                     //--
                     DefaultMutableTreeNode configurationNode = null;
                     //--
@@ -100,7 +100,7 @@ public class SapforTasksResults_json {
                                 configurationNode = new ConfigurationSummary(configuration_id, task);
                             }
                             //--
-                            groupSummary.add(task.getVersionsTree(new File(package_in.getLocalWorkspace(), configuration_id)));
+                            groupSummary.add(task.getVersionsTree(new File(package_in.getLocalWorkspace(), String.valueOf(configuration_id))));
                         }
                         if (configurationNode != null)
                             configurationNode.add(groupSummary);
@@ -122,7 +122,7 @@ public class SapforTasksResults_json {
         sortedTasks.clear();
         //--
         for (TaskState state : TaskState.values()) {
-            LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> configuration_tasks = new LinkedHashMap<>();
+            LinkedHashMap<Integer, LinkedHashMap<String, Vector<SapforTask>>> configuration_tasks = new LinkedHashMap<>();
             sortedTasks.put(state, configuration_tasks);
             //--
             for (SapforTask task : tasks) {
@@ -148,8 +148,8 @@ public class SapforTasksResults_json {
         }
         //--
         for (TaskState state : TaskState.values()) {
-            LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> configuration_tasks = sortedTasks.get(state);
-            for (String configuration_id : configuration_tasks.keySet()) {
+            LinkedHashMap<Integer, LinkedHashMap<String, Vector<SapforTask>>> configuration_tasks = sortedTasks.get(state);
+            for (int configuration_id : configuration_tasks.keySet()) {
                 LinkedHashMap<String, Vector<SapforTask>> groups_tasks = configuration_tasks.get(configuration_id);
                 for (String group : groups_tasks.keySet()) {
                     Vector<SapforTask> tasks_ = groups_tasks.get(group);
@@ -162,11 +162,11 @@ public class SapforTasksResults_json {
         comparisonSortedTasks.clear();
         //раскидать задачи по состояниям, конфигам, группам
         for (MatchState matchState : MatchState.values()) {
-            LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> state_tasks = new LinkedHashMap<>();
+            LinkedHashMap<TaskState, LinkedHashMap<Integer, LinkedHashMap<String, Vector<SapforTask>>>> state_tasks = new LinkedHashMap<>();
             comparisonSortedTasks.put(matchState, state_tasks);
             //--
             for (TaskState state : TaskState.values()) {
-                LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> configuration_tasks = new LinkedHashMap<>();
+                LinkedHashMap<Integer, LinkedHashMap<String, Vector<SapforTask>>> configuration_tasks = new LinkedHashMap<>();
                 state_tasks.put(state, configuration_tasks);
                 //--
                 for (SapforTask task : tasks) {
@@ -193,10 +193,10 @@ public class SapforTasksResults_json {
         }
         //рассортировать задачи в группах по ключам.
         for (MatchState matchState : MatchState.values()) {
-            LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> state_tasks = comparisonSortedTasks.get(matchState);
+            LinkedHashMap<TaskState, LinkedHashMap<Integer, LinkedHashMap<String, Vector<SapforTask>>>> state_tasks = comparisonSortedTasks.get(matchState);
             for (TaskState state : TaskState.values()) {
-                LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> configuration_tasks = state_tasks.get(state);
-                for (String configuration_id : configuration_tasks.keySet()) {
+                LinkedHashMap<Integer, LinkedHashMap<String, Vector<SapforTask>>> configuration_tasks = state_tasks.get(state);
+                for (int configuration_id : configuration_tasks.keySet()) {
                     LinkedHashMap<String, Vector<SapforTask>> groups_tasks = configuration_tasks.get(configuration_id);
                     for (String group : groups_tasks.keySet()) {
                         Vector<SapforTask> tasks_ = groups_tasks.get(group);
@@ -206,7 +206,7 @@ public class SapforTasksResults_json {
             }
         }
     }
-    public void DropComparison(){
+    public void DropComparison() {
         comparison_root = null;
         comparisonSortedTasks.clear();
         for (SapforTask task : allTasks.values())
@@ -218,12 +218,12 @@ public class SapforTasksResults_json {
         Vector<String> summary_lines = new Vector<>();
         summary_lines.add("Всего задач: " + tasks.size());
         for (TaskState state : sortedTasks.keySet()) {
-            LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = sortedTasks.get(state);
+            LinkedHashMap<Integer, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = sortedTasks.get(state);
             if (!tasksByConfigurations.isEmpty()) {
                 int count = 0;
                 if (!state.equals(TaskState.Done)) {
                     Vector<String> flagsLines = new Vector<>();
-                    for (String configuration_id : tasksByConfigurations.keySet()) {
+                    for (int configuration_id : tasksByConfigurations.keySet()) {
                         LinkedHashMap<String, Vector<SapforTask>> tasksByGroups = tasksByConfigurations.get(configuration_id);
                         for (String group : tasksByGroups.keySet()) {
                             Vector<SapforTask> tasks = tasksByGroups.get(group);
@@ -246,8 +246,8 @@ public class SapforTasksResults_json {
                     summary_lines.add(state.getDescription() + " :" + count);
                     summary_lines.addAll(flagsLines);
                 } else {
-                    for (String flags : tasksByConfigurations.keySet()) {
-                        LinkedHashMap<String, Vector<SapforTask>> tasksByGroups = tasksByConfigurations.get(flags);
+                    for (int configurationId : tasksByConfigurations.keySet()) {
+                        LinkedHashMap<String, Vector<SapforTask>> tasksByGroups = tasksByConfigurations.get(configurationId);
                         for (String group : tasksByGroups.keySet()) {
                             Vector<SapforTask> tasks = tasksByGroups.get(group);
                             for (SapforTask task : tasks)
diff --git a/src/TestingSystem/SAPFOR/PackageModeSupervisor.java b/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
index 175ee75f..cac08977 100644
--- a/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
+++ b/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
@@ -36,7 +36,7 @@ public class PackageModeSupervisor extends ThreadsPlanner {
                 task.test_description = test.test_description;
                 task.flags = sapforConfiguration_json.flags;
                 task.sapfor_configuration_id = sapforConfiguration_json.id;
-                task.sapfortaskspackage_id = new File(Global.Home).getName();
+                task.sapfortaskspackage_id = Integer.parseInt(new File(Global.Home).getName());
                 results_json.tasks.add(task);
                 Vector<String> codes_s = new Vector<>();
                 for (PassCode_2021 code : sapforConfiguration_json.codes) {
diff --git a/src/TestingSystem/SAPFOR/PerformSapforTask.java b/src/TestingSystem/SAPFOR/PerformSapforTask.java
index ab78a28c..d26d17b3 100644
--- a/src/TestingSystem/SAPFOR/PerformSapforTask.java
+++ b/src/TestingSystem/SAPFOR/PerformSapforTask.java
@@ -53,8 +53,8 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
         sapforConfiguration_json = (SapforConfiguration_json) args[1];
         target = (SapforTask) args[2];
         //--->>
-        parentTask = Paths.get(Global.Home, sapforConfiguration_json.id, target.test_description).toFile();
-        root = new File(Global.Home, sapforConfiguration_json.id);
+        parentTask = Paths.get(Global.Home, String.valueOf(sapforConfiguration_json.id), target.test_description).toFile();
+        root = new File(Global.Home, String.valueOf(sapforConfiguration_json.id));
         task = null;
         //--->>
         return true;
diff --git a/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java b/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
index a12256e9..c327221c 100644
--- a/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
+++ b/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
@@ -22,10 +22,10 @@ public class SapforTask extends DBObject {
     public long id = Constants.Nan;
     @Description("DEFAULT '-1'")
     @Expose
-    public String sapfor_configuration_id = "";
+    public int sapfor_configuration_id = Constants.Nan;
     @Expose
-    @Description("DEFAULT ''")
-    public String sapfortaskspackage_id = "";
+    @Description("DEFAULT '-1'")
+    public int sapfortaskspackage_id = Constants.Nan;
     //------------------------------------->>
     @Description("DEFAULT ''")
     @Expose
@@ -143,7 +143,7 @@ public class SapforTask extends DBObject {
     }
     @Override
     public boolean isVisible() {
-        return Current.HasSapforTasksPackage() && Current.getSapforTasksPackage().id.equals(this.sapfortaskspackage_id);
+        return Current.HasSapforTasksPackage() && Current.getSapforTasksPackage().id == this.sapfortaskspackage_id;
     }
     public LinkedHashMap<String, SapforVersion_json> getSortedVersions() {
         LinkedHashMap<String, SapforVersion_json> res = new LinkedHashMap<>();
@@ -187,10 +187,10 @@ public class SapforTask extends DBObject {
             task2.match = MatchState.Match;
         }
     }
-    public Date getStartDate(){
+    public Date getStartDate() {
         return new Date(StartDate);
     }
-    public Date getChangeDate(){
+    public Date getChangeDate() {
         return new Date(ChangeDate);
     }
 }
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java
index 7cd1b64f..4f4c9d54 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java
@@ -1,18 +1,18 @@
 package TestingSystem.SAPFOR.SapforTasksPackage;
 import Common.Constants;
 import Common.Database.DBObject;
-import Common.Database.nDBObject;
+import Common.Database.iDBObject;
 import Common.Global;
 import Common.Utils.Utils;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
 import TestingSystem.SAPFOR.Json.SapforTasksResults_json;
 import TestingSystem.SAPFOR.SapforTask.SapforTask;
-import TestingSystem.DVM.TasksPackage.TasksPackageState;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.io.File;
 import java.nio.file.Paths;
 import java.util.Comparator;
-public class SapforTasksPackage extends nDBObject {
+public class SapforTasksPackage extends iDBObject {
     @Description("DEFAULT ''")
     public String testsNames = "";//имена тестов через ; для отображения
     //---
@@ -39,25 +39,6 @@ public class SapforTasksPackage extends nDBObject {
     public String configurationsIds = "";
     @Description("DEFAULT ''")
     public String summary = "";
-    @Override
-    public void SynchronizeFields(DBObject src) {
-        super.SynchronizeFields(src);
-        SapforTasksPackage p = (SapforTasksPackage) src;
-        sapforId = p.sapforId;
-        testsNames = p.testsNames;
-        sapfor_version = p.sapfor_version;
-        sapfor_build_date = p.sapfor_build_date;
-        workspace = p.workspace;
-        tasksCount = p.tasksCount;
-        StartDate = p.StartDate;
-        ChangeDate = p.ChangeDate;
-        kernels = p.kernels;
-        sapfor_process_name = p.sapfor_process_name;
-        state = p.state;
-        needsEmail = p.needsEmail;
-        summary = p.summary;
-    }
-    //---
     @Description("IGNORE")
     public SapforTasksResults_json results = null;
     ///---
@@ -65,10 +46,10 @@ public class SapforTasksPackage extends nDBObject {
         return new File(Global.SapforPackagesDirectory, id + ".zip");
     }
     public File getLocalWorkspace() {
-        return new File(Global.SapforPackagesDirectory, id);
+        return new File(Global.SapforPackagesDirectory, String.valueOf(id));
     }
     public File getLoadedSign() {
-        return Paths.get(Global.SapforPackagesDirectory.getAbsolutePath(), id, Constants.LOADED).toFile();
+        return Paths.get(Global.SapforPackagesDirectory.getAbsolutePath(), String.valueOf(id), Constants.LOADED).toFile();
     }
     public boolean isLoaded() {
         return getLoadedSign().exists();
@@ -92,4 +73,29 @@ public class SapforTasksPackage extends nDBObject {
             ex.printStackTrace();
         }
     }
+    @Override
+    public void SynchronizeFields(DBObject src) {
+        super.SynchronizeFields(src);
+        SapforTasksPackage p = (SapforTasksPackage) src;
+        sapforId = p.sapforId;
+        testsNames = p.testsNames;
+        sapfor_version = p.sapfor_version;
+        sapfor_build_date = p.sapfor_build_date;
+        workspace = p.workspace;
+        tasksCount = p.tasksCount;
+        StartDate = p.StartDate;
+        ChangeDate = p.ChangeDate;
+        kernels = p.kernels;
+        sapfor_process_name = p.sapfor_process_name;
+        state = p.state;
+        needsEmail = p.needsEmail;
+        summary = p.summary;
+    }
+    //---
+    public SapforTasksPackage() {
+    }
+    //--
+    public SapforTasksPackage(SapforTasksPackage sapforTasksPackage) {
+        this.SynchronizeFields(sapforTasksPackage);
+    }
 }
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java
index 8d4b7fe9..fa34a5f5 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java
@@ -9,9 +9,9 @@ import java.util.LinkedHashMap;
 
 import static Common.UI.Tables.TableRenderers.RendererDate;
 import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
-public class SapforTasksPackagesDBTable extends DBTable<String, SapforTasksPackage> {
+public class SapforTasksPackagesDBTable extends iDBTable<SapforTasksPackage> {
     public SapforTasksPackagesDBTable() {
-        super(String.class, SapforTasksPackage.class);
+        super(SapforTasksPackage.class);
     }
     @Override
     public Current CurrentName() {
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/ConfigurationSummary.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/ConfigurationSummary.java
index 548a7ad5..18b1629a 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/ConfigurationSummary.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/ConfigurationSummary.java
@@ -1,4 +1,5 @@
 package TestingSystem.SAPFOR.SapforTasksPackage.UI;
+import Common.Constants;
 import Common.Utils.Utils;
 import TestingSystem.SAPFOR.SapforTask.SapforTask;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -6,10 +7,10 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 import java.util.Arrays;
 import java.util.Vector;
 public class ConfigurationSummary extends SapforPackageTreeNode {
-    public String configuration_id = "";
+    public int configuration_id = Constants.Nan;
     public String flags = "";
     public Vector<String> codes_descriptions = new Vector<>();
-    public ConfigurationSummary(String configuration_id_in, SapforTask task) {
+    public ConfigurationSummary(int configuration_id_in, SapforTask task) {
         configuration_id = configuration_id_in;
         flags = task.flags;
         Vector<String> codes_s = new Vector<>(Arrays.asList(task.codes.split(" ")));
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java b/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
index 9cce3734..0e70b7a1 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
@@ -105,7 +105,7 @@ public class SapforTasksPackageSupervisor {
             SapforConfiguration configuration = configurations.get(configuration_id);
             //--
             SapforConfiguration_json configuration_json = new SapforConfiguration_json();
-            configuration_json.id = String.valueOf(configuration_id);
+            configuration_json.id = Integer.parseInt(configuration_id);
             configuration_json.flags = configuration.getFlags();
             configuration_json.codes.add(PassCode_2021.SPF_CorrectCodeStylePass); //всегда добавляется.
             configuration_json.codes.addAll(configuration.getPassCodes());
diff --git a/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java b/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
index ff3fc7a5..d418211e 100644
--- a/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
@@ -29,7 +29,7 @@ public class AbortSapforTaskPackage extends TestingSystemPass<SapforTasksPackage
                     break;
                 default:
                     TasksPackageToKill tasksPackageToKill = new TasksPackageToKill();
-                    tasksPackageToKill.packageName = target.id;
+                    tasksPackageToKill.packageName = String.valueOf(target.id);
                     packagesToKill.add(tasksPackageToKill);
                     return true;
             }
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
index 4adc7ee7..1759be54 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
@@ -42,7 +42,7 @@ public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPac
     @Override
     protected void ServerAction() throws Exception {
         Command(new ServerExchangeUnit_2021(ServerCode.DownloadSapforTasksPackage, Current.getAccount().email, target.id));
-        response.Unpack(tmpArchive = Utils.getTempFileName(target.id));
+        response.Unpack(tmpArchive = Utils.getTempFileName(String.valueOf(target.id)));
     }
     @Override
     protected boolean validate() {
diff --git a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
index c69a7298..91f8393b 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
@@ -201,7 +201,7 @@ public class StartSapforTests extends TestingSystemPass<SapforTasksPackage> {
     @Override
     protected void ServerAction() throws Exception {
         target = new SapforTasksPackage();
-        target.genName();
+        //target.genName();
         //--
         Vector<String> testsIds = new Vector<>();
         Vector<String> configurationsIds = new Vector<>();
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
index c79b71e8..60c4cdef 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
@@ -26,7 +26,7 @@ public class SapforPackageFields implements DialogFields, FormWithSplitters {
         LoadSplitters();
         object = object_in;
         //--
-        lObjectName.setText(object.id);
+        lObjectName.setText(String.valueOf(object.id));
         /*
         treePanel.add(
                 new JScrollPane(
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
index b593e201..5c392d9d 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
@@ -20,7 +20,7 @@ public class SapforPackageForm extends Dialog<SapforTasksPackage, SapforPackageF
     @Override
     public void Init(Object... params) {
         sapforTasksPackage = (SapforTasksPackage) params[0];
-        fields.lObjectName.setText(sapforTasksPackage.id);
+      //  fields.lObjectName.setText(sapforTasksPackage.id);
         /*
         fields.getTreePanel().add(
                 new JScrollPane(