From 82a5e9c147653b9d023ad2ffbc1ca9641854bf35 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 17 Nov 2023 21:26:01 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 20 +++++-
 src/TestingSystem/Common/Group/Group.java     | 47 +++++++-------
 .../SapforConfiguration.java                  | 60 ++++++++++++++++--
 .../SapforConfigurationDBTable.java           | 18 ++----
 .../SapforConfigurationInterface.java         | 62 -------------------
 .../SapforConfigurationCommand.java           | 12 ++--
 .../SapforConfigurationCommandInterface.java  |  7 ---
 .../SapforConfigurationCommandsDBTable.java   | 15 +----
 .../SapforTasksPackageSupervisor.java         | 15 +++--
 .../Passes/All/DeleteSapforConfiguration.java | 20 ++----
 .../All/DeleteSapforConfigurationCommand.java | 20 ++----
 .../Passes/All/EditSapforConfiguration.java   | 27 ++------
 .../All/EditSapforConfigurationCommand.java   | 35 ++---------
 ...ditSapforConfigurationCommandOnServer.java | 16 -----
 .../All/EditSapforConfigurationOnServer.java  | 16 -----
 .../All/PublishSapforConfiguration.java       | 44 ++-----------
 .../PublishSapforConfigurationCommand.java    | 45 +++-----------
 .../Passes/All/StartSapforTests.java          |  4 +-
 src/Visual_DVM_2021/Passes/PassCode_2021.java | 10 +--
 19 files changed, 155 insertions(+), 338 deletions(-)
 delete mode 100644 src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationInterface.java
 delete mode 100644 src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandInterface.java
 delete mode 100644 src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java
 delete mode 100644 src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9961ddb5..9860472a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,25 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.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/Common/Group/Group.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/Group.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
+      <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/SapforConfiguration/SapforConfigurationInterface.java" beforeDir="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/SapforConfigurationCommandInterface.java" beforeDir="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$/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.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" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/TestingSystem/Common/Group/Group.java b/src/TestingSystem/Common/Group/Group.java
index 3b466a14..1414fbb4 100644
--- a/src/TestingSystem/Common/Group/Group.java
+++ b/src/TestingSystem/Common/Group/Group.java
@@ -27,6 +27,30 @@ public class Group extends riDBObject {
         return (!GroupsDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address)) &&
                 Global.testingServer.db.groups.applyFilters(this);
     }
+    public String getSummary() {
+        return description + " " + language.getDescription();
+    }
+    //-
+
+    @Override
+    public void SynchronizeFields(DBObject src) {
+        super.SynchronizeFields(src);
+        Group g = (Group) src;
+        type = g.type;
+        language = g.language;
+    }
+    public Group(Group group) {
+        this.SynchronizeFields(group);
+    }
+    public Group() {
+    }
+    @Override
+    public void select(boolean flag) {
+        super.select(flag);
+        if (Current.hasUI())
+            UI.getMainWindow().ShowCheckedTestsCount();
+    }
+    //--
     //-
     public static void generateForLanguage(
             String dvm_drv,
@@ -92,27 +116,4 @@ public class Group extends riDBObject {
                 "\t" + Utils.MFVar("LINK_COMMAND") + " " + Utils.MFVar("LINK_FLAGS") + " " + String.join(" ", objects) + " -o " + binary,
                 String.join(" ", bodies));
     }
-    public String getSummary() {
-        return description + " " + language.getDescription();
-    }
-    //-
-
-    @Override
-    public void SynchronizeFields(DBObject src) {
-        super.SynchronizeFields(src);
-        Group g = (Group) src;
-        type = g.type;
-        language = g.language;
-    }
-    public Group(Group group) {
-        this.SynchronizeFields(group);
-    }
-    public Group() {
-    }
-    @Override
-    public void select(boolean flag) {
-        super.select(flag);
-        if (Current.hasUI())
-            UI.getMainWindow().ShowCheckedTestsCount();
-    }
 }
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
index a4048617..f1fec1af 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
@@ -1,11 +1,59 @@
 package TestingSystem.SAPFOR.SapforConfiguration;
-import Common.Database.rDBObject;
-public class SapforConfiguration extends rDBObject {
+import Common.Database.DBObject;
+import Common.Database.riDBObject;
+import Common.Global;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
+import Visual_DVM_2021.Passes.PassCode_2021;
+
+import java.util.Vector;
+public class SapforConfiguration extends riDBObject {
     //настройки.
-    public int maxtime = 300; //лимит времени преобразования.
+    public int maxtime = 300; //лимит времени преобразования. (пока не используется)
     public int FREE_FORM = 0; //"Свободный выходной стиль"; -f90
-    public int STATIC_SHADOW_ANALYSIS=0;//"Оптимизация теневых обменов"; -sh
-    public int MAX_SHADOW_WIDTH=50; // "Максимальный размер теневых граней"; (%) -shwidth значение поля
-    public int KEEP_SPF_DIRECTIVES=0; //"Сохранять SPF директивы при построении параллельных вариантов"; -keepSPF
+    public int STATIC_SHADOW_ANALYSIS = 0;//"Оптимизация теневых обменов"; -sh
+    public int MAX_SHADOW_WIDTH = 50; // "Максимальный размер теневых граней"; (%) -shwidth значение поля
+    public int KEEP_SPF_DIRECTIVES = 0; //"Сохранять SPF директивы при построении параллельных вариантов"; -keepSPF
     public int KEEP_DVM_DIRECTIVES = 0;// "Учитывать DVM директивы"; -keepDVM
+    //----
+    public String getFlags() {
+        Vector<String> res = new Vector<>();
+        if (FREE_FORM > 0)
+            res.add("-f90");
+        if (STATIC_SHADOW_ANALYSIS > 0)
+            res.add("-sh");
+        if (MAX_SHADOW_WIDTH > 0)
+            res.add("-shwidth " + MAX_SHADOW_WIDTH);
+        if (KEEP_DVM_DIRECTIVES > 0)
+            res.add("-keepDVM");
+        if (KEEP_SPF_DIRECTIVES > 0)
+            res.add("-keepSPF");
+        return String.join(" ", res);
+    }
+    //-
+    public Vector<PassCode_2021> getPassCodes() {
+        Vector<PassCode_2021> res = new Vector<>();
+        for (SapforConfigurationCommand command : Global.testingServer.db.sapforConfigurationCommands.Data.values()) {
+            if (command.sapforconfiguration_id == id) {
+                res.add(command.passCode);
+            }
+        }
+        return res;
+    }
+    //--
+    @Override
+    public void SynchronizeFields(DBObject src) {
+        super.SynchronizeFields(src);
+        SapforConfiguration c = (SapforConfiguration) src;
+        maxtime = c.maxtime;
+        FREE_FORM = c.FREE_FORM;
+        STATIC_SHADOW_ANALYSIS = c.STATIC_SHADOW_ANALYSIS;
+        MAX_SHADOW_WIDTH = c.MAX_SHADOW_WIDTH;
+        KEEP_SPF_DIRECTIVES = c.KEEP_SPF_DIRECTIVES;
+        KEEP_DVM_DIRECTIVES = c.KEEP_DVM_DIRECTIVES;
+    }
+    public SapforConfiguration(SapforConfiguration sapforConfiguration) {
+        this.SynchronizeFields(sapforConfiguration);
+    }
+    public SapforConfiguration() {
+    }
 }
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
index 07774023..8336b421 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
@@ -8,9 +8,9 @@ import TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields;
 import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
 
 import java.util.LinkedHashMap;
-public class SapforConfigurationDBTable extends DBTable<String, SapforConfiguration> {
+public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
     public SapforConfigurationDBTable() {
-        super(String.class, SapforConfiguration.class);
+        super(SapforConfiguration.class);
     }
     @Override
     public Current CurrentName() {
@@ -33,17 +33,7 @@ public class SapforConfigurationDBTable extends DBTable<String, SapforConfigurat
             }
             @Override
             protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-            }
-            @Override
-            public void ShowCurrentObject() throws Exception {
-                super.ShowCurrentObject();
-               // Global.db.sapforTasksPackages.ShowUI();
-            }
-            @Override
-            public void ShowNoCurrentObject() throws Exception {
-                super.ShowNoCurrentObject();
-              //  Global.db.sapforTasksPackages.ClearUI();
+                //columns.get(0).setVisible(false);
             }
         };
     }
@@ -63,7 +53,7 @@ public class SapforConfigurationDBTable extends DBTable<String, SapforConfigurat
             case 3:
                 return object.sender_name;
             case 4:
-                return SapforConfigurationInterface.getFlags(object);
+                return object.getFlags();
             default:
                 return null;
         }
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationInterface.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationInterface.java
deleted file mode 100644
index 45ce6dc1..00000000
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationInterface.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package TestingSystem.SAPFOR.SapforConfiguration;
-import Common.Global;
-import Common.Utils.TextLog;
-import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
-import Visual_DVM_2021.Passes.PassCode_2021;
-
-import java.util.Vector;
-public class SapforConfigurationInterface {
-    public static String getFlags(SapforConfiguration object) {
-        Vector<String> res = new Vector<>();
-        if (object.FREE_FORM > 0)
-            res.add("-f90");
-        if (object.STATIC_SHADOW_ANALYSIS > 0)
-            res.add("-sh");
-        if (object.MAX_SHADOW_WIDTH > 0)
-            res.add("-shwidth " + object.MAX_SHADOW_WIDTH);
-        if (object.KEEP_DVM_DIRECTIVES > 0)
-            res.add("-keepDVM");
-        if (object.KEEP_SPF_DIRECTIVES > 0)
-            res.add("-keepSPF");
-        return String.join(" ", res);
-    }
-    public static Vector<PassCode_2021> getPassCodes(SapforConfiguration object) {
-        Vector<PassCode_2021> res = new Vector<>();
-        for (SapforConfigurationCommand command : Global.testingServer.db.sapforConfigurationCommands.Data.values()) {
-            if (command.sapforconfiguration_id.equals(object.id)) {
-                res.add(command.passCode);
-            }
-        }
-        return res;
-    }
-    //todo вывести.
-    public static boolean validateCommands(SapforConfiguration sapforConfiguration, TextLog log) {
-        //1. получить список всех команд.
-        Vector<SapforConfigurationCommand> commands = new Vector<>();
-        int count = 0;
-        for (SapforConfigurationCommand command : Global.testingServer.db.sapforConfigurationCommands.Data.values()) {
-            if (command.sapforconfiguration_id.equals(sapforConfiguration.id)) {
-                commands.add(command);
-                if (command.passCode.equals(PassCode_2021.CreateParallelVariants))
-                    count++;
-            }
-        }
-        if ((count == 0) || commands.isEmpty())
-            return true;
-        //--
-        if (count > 2) {
-            log.Writeln_("Неверная конфигурация:" + sapforConfiguration.id + ": построение параллельных вариантов возможно единожды.");
-            return false;
-        }
-        //--
-        if (count == 1) {
-            if (commands.size() == 1) return true;
-            if (!commands.lastElement().passCode.equals(PassCode_2021.CreateParallelVariants)) {
-                log.Writeln_("Неверная конфигурация:" + sapforConfiguration.id + ": построение параллельных вариантов может быть только завершающей командой!");
-                return false;
-            }
-            ;
-        }
-        return true;
-    }
-}
diff --git a/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommand.java b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommand.java
index 95dc4787..0d50375c 100644
--- a/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommand.java
+++ b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommand.java
@@ -1,13 +1,15 @@
 package TestingSystem.SAPFOR.SapforConfigurationCommand;
-import Common.Database.rDBObject;
+import Common.Constants;
+import Common.Current;
+import Common.Database.riDBObject;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.sun.org.glassfish.gmbal.Description;
-public class SapforConfigurationCommand extends rDBObject {
-    @Description("DEFAULT ''")
-    public String sapforconfiguration_id = "";
+public class SapforConfigurationCommand extends riDBObject {
+    @Description("DEFAULT -1")
+    public int sapforconfiguration_id = Constants.Nan;
     public PassCode_2021 passCode = PassCode_2021.SPF_RemoveDvmDirectives;
     @Override
     public boolean isVisible() {
-        return SapforConfigurationCommandInterface.isVisible(this);
+        return Current.HasSapforConfiguration() && (Current.getSapforConfiguration().id == sapforconfiguration_id);
     }
 }
diff --git a/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandInterface.java b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandInterface.java
deleted file mode 100644
index b7e0cb63..00000000
--- a/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandInterface.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package TestingSystem.SAPFOR.SapforConfigurationCommand;
-import Common.Current;
-public class SapforConfigurationCommandInterface {
-    public static boolean isVisible(SapforConfigurationCommand object) {
-        return Current.HasSapforConfiguration() && (Current.getSapforConfiguration().id.equals(object.sapforconfiguration_id));
-    }
-}
diff --git a/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
index d299f89a..c311c60e 100644
--- a/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
@@ -1,14 +1,14 @@
 package TestingSystem.SAPFOR.SapforConfigurationCommand;
 import Common.Current;
-import Common.Database.DBTable;
+import Common.Database.iDBTable;
 import Common.UI.DataSetControlForm;
 import Common.UI.UI;
 import Common.UI.Windows.Dialog.DBObjectDialog;
 import TestingSystem.SAPFOR.SapforConfigurationCommand.UI.SapforConfigurationCommandFields;
 import Visual_DVM_2021.Passes.PassCode_2021;
-public class SapforConfigurationCommandsDBTable extends DBTable<String, SapforConfigurationCommand> {
+public class SapforConfigurationCommandsDBTable extends iDBTable<SapforConfigurationCommand> {
     public SapforConfigurationCommandsDBTable() {
-        super(String.class, SapforConfigurationCommand.class);
+        super(SapforConfigurationCommand.class);
     }
     @Override
     public String getSingleDescription() {
@@ -62,15 +62,6 @@ public class SapforConfigurationCommandsDBTable extends DBTable<String, SapforCo
                 Result.passCode = (PassCode_2021) fields.cbPassCode.getSelectedItem();
                 Result.sapforconfiguration_id = Current.getSapforConfiguration().id;
             }
-            @Override
-            public void validateFields() {
-                /*
-                Vector<ScenarioCommand> commands = new Vector<>(Current.getSapforConfiguration().getCommands().values());
-                if (!commands.isEmpty()&&commands.get(commands.size()-1).passCode.equals(PassCode_2021.CreateParallelVariantsCoverageForScenario)){
-                    Log.Writeln_("После построения покрытия вариантов запрещено добавлять другие команды в сценарий.");
-                }
-                 */
-            }
         };
     }
 }
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java b/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
index 9a0d9475..9cce3734 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
@@ -5,18 +5,17 @@ import Common.Global;
 import Common.GlobalProperties;
 import Common.Utils.Utils;
 import Repository.Server.ServerCode;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.Common.TestingPlanner;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
 import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
 import TestingSystem.SAPFOR.Json.SapforTasksPackage_json;
 import TestingSystem.SAPFOR.Json.SapforTasksResults_json;
 import TestingSystem.SAPFOR.Json.SapforTest_json;
 import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationInterface;
 import TestingSystem.SAPFOR.SapforTask.SapforTask;
 import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.Common.Group.Group;
-import TestingSystem.DVM.TasksPackage.TasksPackageState;
-import TestingSystem.Common.Test.Test;
-import TestingSystem.Common.TestingPlanner;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
@@ -39,7 +38,7 @@ public class SapforTasksPackageSupervisor {
         Vector<Object> tests_ = (Vector<Object>) planner.ServerCommand(ServerCode.GetObjectsCopiesByPK, "", new Pair<>(Test.class, testsIds));
         Vector<Object> configurations_ = (Vector<Object>) planner.ServerCommand(ServerCode.GetObjectsCopiesByPK, "", new Pair<>(SapforConfiguration.class, configurationsIds));
         LinkedHashMap<Integer, Test> tests = new LinkedHashMap<>();
-        LinkedHashMap<String, SapforConfiguration> configurations = new LinkedHashMap<>();
+        LinkedHashMap<Integer, SapforConfiguration> configurations = new LinkedHashMap<>();
         Vector<Integer> groupsIds = new Vector<>();
         LinkedHashMap<Integer, Group> groups = new LinkedHashMap<>();
         //--
@@ -107,9 +106,9 @@ public class SapforTasksPackageSupervisor {
             //--
             SapforConfiguration_json configuration_json = new SapforConfiguration_json();
             configuration_json.id = String.valueOf(configuration_id);
-            configuration_json.flags = SapforConfigurationInterface.getFlags(configuration);
+            configuration_json.flags = configuration.getFlags();
             configuration_json.codes.add(PassCode_2021.SPF_CorrectCodeStylePass); //всегда добавляется.
-            configuration_json.codes.addAll(SapforConfigurationInterface.getPassCodes(configuration));
+            configuration_json.codes.addAll(configuration.getPassCodes());
             //--->>
             package_json.configurations.add(configuration_json);
             //-->>
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java b/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java
index fbd3bcb5..8f756384 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java
@@ -1,20 +1,10 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Current;
+import Common.Global;
+import TestingSystem.Common.TestingServer;
 import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
-
-import java.util.Vector;
-public class DeleteSapforConfiguration extends DeleteSelectedServerObjects {
+import Visual_DVM_2021.Passes.Server.DeleteServerObject;
+public class DeleteSapforConfiguration extends DeleteServerObject<TestingServer, SapforConfiguration> {
     public DeleteSapforConfiguration() {
-        super(SapforConfiguration.class);
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (Current.Check(Log, Current.SapforConfiguration)){
-            target= new Vector<>();
-            target.add(Current.getSapforConfiguration());
-            return true;
-        }
-        return false;
+        super(Global.testingServer, SapforConfiguration.class);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java b/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java
index 8fb065ab..c7ba4f1e 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java
@@ -1,20 +1,10 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Current;
+import Common.Global;
+import TestingSystem.Common.TestingServer;
 import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
-import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
-
-import java.util.Vector;
-public class DeleteSapforConfigurationCommand extends DeleteSelectedServerObjects {
+import Visual_DVM_2021.Passes.Server.DeleteServerObject;
+public class DeleteSapforConfigurationCommand extends DeleteServerObject<TestingServer, SapforConfigurationCommand> {
     public DeleteSapforConfigurationCommand() {
-        super(SapforConfigurationCommand.class);
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (Current.Check(Log, Current.SapforConfigurationCommand)){
-            target= new Vector<>();
-            target.add(Current.getSapforConfigurationCommand());
-            return true;
-        }
-        return false;
+        super(Global.testingServer, SapforConfigurationCommand.class);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java b/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java
index 258128f8..34f1024c 100644
--- a/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java
@@ -1,29 +1,10 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Current;
-import Common.Database.Database;
 import Common.Global;
+import TestingSystem.Common.TestingServer;
 import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import Visual_DVM_2021.Passes.EditObjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
-public class EditSapforConfiguration extends EditObjectPass<SapforConfiguration> {
+import Visual_DVM_2021.Passes.Server.EditServerObject;
+public class EditSapforConfiguration extends EditServerObject<TestingServer,SapforConfiguration> {
     public EditSapforConfiguration() {
-        super(SapforConfiguration.class);
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (Current.Check(Log, Current.SapforConfiguration)) {
-            return getTable().ShowEditObjectDialog(target = Current.getSapforConfiguration());
-        }
-        return false;
-    }
-    @Override
-    protected void performDone() throws Exception {
-        super.performDone();
-        //отправка.
-        passes.get(PassCode_2021.EditSapforConfigurationOnServer).Do(target);
-    }
-    @Override
-    protected Database getDb() {
-        return Global.testingServer.db;
+        super(Global.testingServer, SapforConfiguration.class);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java b/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java
index 4348fbde..b87c6d02 100644
--- a/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java
+++ b/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java
@@ -1,38 +1,11 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Current;
-import Common.Database.Database;
 import Common.Global;
+import TestingSystem.Common.TestingServer;
 import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
-import Visual_DVM_2021.Passes.EditObjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
-public class EditSapforConfigurationCommand  extends EditObjectPass<SapforConfigurationCommand> {
+import Visual_DVM_2021.Passes.Server.EditServerObject;
+public class EditSapforConfigurationCommand  extends EditServerObject<TestingServer,SapforConfigurationCommand> {
     public EditSapforConfigurationCommand() {
-        super(SapforConfigurationCommand.class);
-    }
-    @Override
-    public String getIconPath() {
-        return "/icons/Edit.png";
-    }
-    @Override
-    public String getButtonText() {
-        return "";
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (Current.Check(Log, Current.SapforConfigurationCommand)) {
-            return getTable().ShowEditObjectDialog(target = (SapforConfigurationCommand) Current.get(Current.SapforConfigurationCommand));
-        }
-        return false;
-    }
-    @Override
-    protected void performDone() throws Exception {
-        super.performDone();
-        //отправка.
-        passes.get(PassCode_2021.EditSapforConfigurationCommandOnServer).Do(target);
-    }
-    @Override
-    protected Database getDb() {
-        return Global.testingServer.db;
+        super(Global.testingServer,SapforConfigurationCommand.class);
     }
 }
 
diff --git a/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java b/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java
deleted file mode 100644
index 990df6bc..00000000
--- a/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
-public class EditSapforConfigurationCommandOnServer extends TestingSystemPass<SapforConfigurationCommand> {
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        target = (SapforConfigurationCommand) args[0];
-        return true;
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", target));
-    }
-}
\ No newline at end of file
diff --git a/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java b/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java
deleted file mode 100644
index 8ae225b7..00000000
--- a/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
-public class EditSapforConfigurationOnServer extends TestingSystemPass<SapforConfiguration> {
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        target = (SapforConfiguration) args[0];
-        return true;
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", target));
-    }
-}
diff --git a/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java b/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java
index d12c9538..8e539e16 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java
@@ -1,42 +1,10 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Current;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
+import Common.Global;
+import TestingSystem.Common.TestingServer;
 import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
-public class PublishSapforConfiguration extends TestingSystemPass<SapforConfiguration> {
-    @Override
-    public String getIconPath() {
-        return "/icons/RedAdd.png";
-    }
-    @Override
-    public String getButtonText() {
-        return "";
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (Current.getAccount().CheckRegistered(Log)) {
-            target = new SapforConfiguration();
-            target.genName();
-            target.sender_name = Current.getAccount().name;
-            target.sender_address = Current.getAccount().email;
-            return server.db.sapforConfigurations.ShowAddObjectDialog(target);
-        }
-        return false;
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", target));
-    }
-    @Override
-    protected void performFinish() throws Exception {
-        super.performFinish();
-        passes.get(PassCode_2021.SynchronizeTests).Do();
-    }
-    @Override
-    protected void showDone() throws Exception {
-        super.showDone();
-        server.db.sapforConfigurations.ui_.Show(target.getPK());
+import Visual_DVM_2021.Passes.Server.PublishServerObject;
+public class PublishSapforConfiguration extends PublishServerObject<TestingServer, SapforConfiguration> {
+    public PublishSapforConfiguration() {
+        super(Global.testingServer, SapforConfiguration.class);
     }
 }
\ No newline at end of file
diff --git a/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java b/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java
index 83ec35e6..b295dac3 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java
@@ -1,43 +1,16 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
+import Common.Global;
+import TestingSystem.Common.TestingServer;
 import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
-public class PublishSapforConfigurationCommand extends TestingSystemPass<SapforConfigurationCommand> {
-    @Override
-    public String getIconPath() {
-        return "/icons/RedAdd.png";
+import Visual_DVM_2021.Passes.Server.PublishServerObject;
+public class PublishSapforConfigurationCommand extends PublishServerObject<TestingServer, SapforConfigurationCommand> {
+    public PublishSapforConfigurationCommand() {
+        super(Global.testingServer, SapforConfigurationCommand.class);
     }
     @Override
-    public String getButtonText() {
-        return "";
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (Current.getAccount().CheckRegistered(Log)&& Current.Check(Log, Current.SapforConfiguration)) {
-            target = new SapforConfigurationCommand();
-            target.genName();
-            target.sender_name = Current.getAccount().name;
-            target.sender_address = Current.getAccount().email;
-            target.sapforconfiguration_id=Current.getSapforConfiguration().id;
-            return server.db.sapforConfigurationCommands.ShowAddObjectDialog(target);
-        }
-        return false;
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", target));
-    }
-    @Override
-    protected void performFinish() throws Exception {
-        super.performFinish();
-        passes.get(PassCode_2021.SynchronizeTests).Do();
-    }
-    @Override
-    protected void showDone() throws Exception {
-        super.showDone();
-        server.db.sapforConfigurationCommands.ui_.Show(target.getPK());
+    public boolean fillObjectFields() throws Exception {
+        target.sapforconfiguration_id=Current.getSapforConfiguration().id;
+        return super.fillObjectFields();
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
index a493f272..c69a7298 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
@@ -111,7 +111,7 @@ public class StartSapforTests extends TestingSystemPass<SapforTasksPackage> {
             terminalCodesCount.put(code, new Index());
         //--
         for (SapforConfigurationCommand command : Global.testingServer.db.sapforConfigurationCommands.Data.values()) {
-            if (command.sapforconfiguration_id.equals(sapforConfiguration.id)) {
+            if (command.sapforconfiguration_id==sapforConfiguration.id) {
                 codes.add(command.passCode);
                 //---
                 for (PassCode_2021 t_code : Constants.terminalSapforTestingCodes) {
@@ -209,7 +209,7 @@ public class StartSapforTests extends TestingSystemPass<SapforTasksPackage> {
             testsIds.add(String.valueOf(test.id));
         //--
         for (SapforConfiguration configuration : Global.testingServer.db.sapforConfigurations.getCheckedItems())
-            configurationsIds.add(configuration.id);
+            configurationsIds.add(String.valueOf(configuration.id));
         //--
         target.tasksCount = allTasksCount;
         target.testsIds = String.join("\n", testsIds);
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index bd85fc0b..c30bc2fa 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -289,12 +289,10 @@ public enum PassCode_2021 {
     //--
     PublishSapforConfiguration,
     EditSapforConfiguration,
-    EditSapforConfigurationOnServer,
     DeleteSapforConfiguration,
     //-
     PublishSapforConfigurationCommand,
     EditSapforConfigurationCommand,
-    EditSapforConfigurationCommandOnServer,
     DeleteSapforConfigurationCommand,
     //->
     DownloadSapforTasksPackage,
@@ -389,9 +387,7 @@ public enum PassCode_2021 {
             case DeleteDownloadedBugReports:
                 return "Удалить загруженные отчёты об ошибках";
             case DeleteSapforConfigurationCommand:
-                return "Удалить выбранные команды конфигурации тестирования Sapfor на сервере";
-            case EditSapforConfigurationCommandOnServer:
-                return "Редактировать команду конфигурации тестирования Sapfor на сервере";
+                return "Удалить команду конфигурации тестирования Sapfor";
             case EditSapforConfigurationCommand:
                 return "Редактировать команду конфигурации тестирования Sapfor";
             case PublishSapforConfigurationCommand:
@@ -400,10 +396,8 @@ public enum PassCode_2021 {
                 return "Опубликовать конфигурацию тестирования SAPFOR";
             case EditSapforConfiguration:
                 return "Редактировать конфигурацию тестирования SAPFOR";
-            case EditSapforConfigurationOnServer:
-                return "Редактировать конфигурацию тестирования SAPFOR на сервере";
             case DeleteSapforConfiguration:
-                return "Удалить выбранные конфигурации тестирования SAPFOR на сервере";
+                return "Удалить конфигурацию тестирования SAPFOR";
             case ExcludeSelectedFiles:
                 return "Исключить из рассмотрения отмеченные файлы";
             case IncludeSelectedFiles: