From 1ff88fc5fb3865630aeab13e8ae679e4d799c7bf Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 16 Nov 2023 22:11:58 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 14 ++++++-
 .../GroupsMenuBar/GroupsMenuBar.java          |  6 ++-
 src/Repository/Server/ServerCode.java         |  2 +-
 .../ServerSapfor/ServerSapfor.java            |  4 +-
 src/TestingSystem/TestingServer.java          |  4 +-
 .../Passes/All/DeleteGroup.java               | 10 +++++
 .../Passes/All/DeleteSelectedGroups.java      |  8 ----
 .../Passes/All/DeleteServerSapfor.java        | 36 ++---------------
 .../Passes/All/InstallServerSapfor.java       | 26 ++++--------
 .../Passes/All/PublishServerSapfor.java       | 15 +++++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  9 +++--
 .../Passes/Server/DeleteServerObject.java     | 40 +++++++++++++++++++
 .../Passes/Server/EditServerObject.java       |  4 +-
 13 files changed, 105 insertions(+), 73 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/DeleteGroup.java
 delete mode 100644 src/Visual_DVM_2021/Passes/All/DeleteSelectedGroups.java
 create mode 100644 src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java
 create mode 100644 src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 36bbb258..298eb1b7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,19 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteGroup.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.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/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Group/GroupsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ServerSapfor/ServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/ServerSapfor/ServerSapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedGroups.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.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" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java b/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
index 5585ad3b..ef6cb1dc 100644
--- a/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
+++ b/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
@@ -9,7 +9,11 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 import javax.swing.*;
 public class GroupsMenuBar extends DataMenuBar {
     public GroupsMenuBar() {
-        super("группы", PassCode_2021.SynchronizeTests, PassCode_2021.ConvertCorrectnessTests, PassCode_2021.PublishGroup,PassCode_2021.EditGroup, PassCode_2021.DeleteSelectedGroups);
+        super("группы", PassCode_2021.SynchronizeTests, PassCode_2021.ConvertCorrectnessTests,
+                PassCode_2021.PublishGroup,
+                PassCode_2021.EditGroup,
+                PassCode_2021.DeleteGroup
+                );
         add(new JSeparator());
         add(new MenuBarButton() {
             {
diff --git a/src/Repository/Server/ServerCode.java b/src/Repository/Server/ServerCode.java
index 7fdd926d..9dbfc26b 100644
--- a/src/Repository/Server/ServerCode.java
+++ b/src/Repository/Server/ServerCode.java
@@ -30,7 +30,7 @@ public enum ServerCode {
     //-
     PublishObject,
     EditObject,
-    DeleteObject,
+    DeleteObject, //--------------------УСТАРЕЛО. УБРАТЬ.
     GetObjectCopyByPK,
     GetObjectsCopiesByPK,
     DeleteObjects,
diff --git a/src/SapforTestingSystem/ServerSapfor/ServerSapfor.java b/src/SapforTestingSystem/ServerSapfor/ServerSapfor.java
index c7074897..a74605f5 100644
--- a/src/SapforTestingSystem/ServerSapfor/ServerSapfor.java
+++ b/src/SapforTestingSystem/ServerSapfor/ServerSapfor.java
@@ -1,11 +1,11 @@
 package SapforTestingSystem.ServerSapfor;
-import Common.Database.iDBObject;
+import Common.Database.riDBObject;
 import Common.Utils.Utils;
 import ProjectData.LanguageName;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.Date;
-public class ServerSapfor extends iDBObject {
+public class ServerSapfor extends riDBObject {
     //--------------------------------------------------------------------->>>
     @Description("IGNORE")
     public static String version_command = "-ver";//команда запроса версии компилятора.
diff --git a/src/TestingSystem/TestingServer.java b/src/TestingSystem/TestingServer.java
index da321919..1de84d46 100644
--- a/src/TestingSystem/TestingServer.java
+++ b/src/TestingSystem/TestingServer.java
@@ -37,7 +37,6 @@ import javafx.util.Pair;
 import javax.swing.*;
 import java.io.File;
 import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.Vector;
@@ -292,7 +291,8 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 Vector<String> assembly_info = (Vector<String>) request.object;
                 File out = Paths.get(Global.RepoDirectory.getAbsolutePath(), Constants.SAPFOR_REPOSITORY_BIN, Constants.out_file).toFile();
                 File err = Paths.get(Global.RepoDirectory.getAbsolutePath(), Constants.SAPFOR_REPOSITORY_BIN, Constants.err_file).toFile();
-                Vector<String> targets = new Vector<>(Arrays.asList(Global.admins_mails));
+                Vector<String> targets = new Vector<>();//Arrays.asList(Global.admins_mails));
+                targets.add("vmk-post@yandex.ru");
                 EmailMessage message = new EmailMessage(
                         "Выполнена сборка системы SAPFOR",
                         "Версия: " + assembly_info.get(0) + "\n" + "Статус: " + assembly_info.get(1),
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteGroup.java b/src/Visual_DVM_2021/Passes/All/DeleteGroup.java
new file mode 100644
index 00000000..4e3f2078
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/DeleteGroup.java
@@ -0,0 +1,10 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Global;
+import TestingSystem.Group.Group;
+import TestingSystem.TestingServer;
+import Visual_DVM_2021.Passes.Server.DeleteServerObject;
+public class DeleteGroup extends DeleteServerObject<TestingServer, Group> {
+    public DeleteGroup() {
+        super(Global.testingServer, Group.class);
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedGroups.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedGroups.java
deleted file mode 100644
index de4ee287..00000000
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedGroups.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package Visual_DVM_2021.Passes.All;
-import TestingSystem.Group.Group;
-import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
-public class DeleteSelectedGroups extends DeleteSelectedServerObjects {
-    public DeleteSelectedGroups() {
-        super(Group.class);
-    }
-}
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java b/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java
index 501661d5..be33fc22 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java
@@ -1,38 +1,10 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Database.Database;
 import Common.Global;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
 import SapforTestingSystem.ServerSapfor.ServerSapfor;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
-import Visual_DVM_2021.Passes.Pass_2021;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
-public class DeleteServerSapfor extends DeleteObjectPass<ServerSapfor> {
+import TestingSystem.TestingServer;
+import Visual_DVM_2021.Passes.Server.DeleteServerObject;
+public class DeleteServerSapfor extends DeleteServerObject<TestingServer, ServerSapfor> {
     public DeleteServerSapfor() {
-        super(ServerSapfor.class);
-    }
-    @Override
-    protected Database getDb() {
-        return Global.testingServer.db;
-    }
-    @Override
-    protected void performDone() throws Exception {
-        super.performDone();
-        Pass_2021 serverPass = new TestingSystemPass<ServerSapfor>() {
-            @Override
-            public String getDescription() {
-                return "Удаление тестовой версии SAPFOR с сервера";
-            }
-            @Override
-            protected boolean canStart(Object... args) throws Exception {
-                target = (ServerSapfor) args[0];
-                return true;
-            }
-            @Override
-            protected void ServerAction() throws Exception {
-                Command(new ServerExchangeUnit_2021(ServerCode.DeleteObject, "", target));
-            }
-        };
-        serverPass.Do(target);
+        super(Global.testingServer, ServerSapfor.class);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java b/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
index 8a5d628c..51ea70aa 100644
--- a/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
+++ b/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
@@ -1,7 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Constants;
 import Common.Current;
-import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import ProjectData.LanguageName;
@@ -83,17 +82,11 @@ public class InstallServerSapfor extends ConnectionPass<Object> {
             String[] data = raw.split(" ");
             if (data.length >= 4) serverSapfor.version = data[3].replace(",", "");
             //---
-            result = new TestingSystemPass() {
-                @Override
-                public String getDescription() {
-                    return "Публикация тестовой версии";
-                }
-                @Override
-                protected void ServerAction() throws Exception {
-                    Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", serverSapfor));
-                }
-            }.Do();
         }
+    }
+    @Override
+    protected void performFinish() throws Exception {
+        super.performFinish();
         new TestingSystemPass() {
             @Override
             public String getDescription() {
@@ -116,18 +109,13 @@ public class InstallServerSapfor extends ConnectionPass<Object> {
         return result;
     }
     @Override
-    protected void performDone() throws Exception {
-        super.performDone();
-        passes.get(PassCode_2021.SynchronizeTests).Do();
-    }
-    @Override
     protected void showFail() throws Exception {
         Log.Writeln_("Файл [SAPFOR_F] не найден!");
     }
     @Override
-    protected void showDone() throws Exception {
-        super.showDone();
-        Global.testingServer.db.serverSapfors.ui_.Show(serverSapfor.getPK());
+    protected void performDone() throws Exception {
+        passes.get(PassCode_2021.PublishServerSapfor).Do(serverSapfor);
     }
+
 }
 
diff --git a/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java b/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java
new file mode 100644
index 00000000..7b95888f
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java
@@ -0,0 +1,15 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Global;
+import SapforTestingSystem.ServerSapfor.ServerSapfor;
+import TestingSystem.TestingServer;
+import Visual_DVM_2021.Passes.Server.PublishServerObject;
+public class PublishServerSapfor extends PublishServerObject<TestingServer, ServerSapfor> {
+    public PublishServerSapfor() {
+        super(Global.testingServer, ServerSapfor.class);
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        target = (ServerSapfor) args[0];
+        return true;
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 9a658313..2ed04428 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -209,6 +209,7 @@ public enum PassCode_2021 {
     //-
     EditGroup,
     PublishGroup,
+    DeleteGroup,
     //-
     DownloadAllBugReportsArchives,
     ShowInstruction,
@@ -251,7 +252,6 @@ public enum PassCode_2021 {
     PlayTesting,
     //-
     SPF_GetMaxMinBlockDistribution,
-    DeleteSelectedGroups,
     //-
     PublishConfiguration,
     EditConfiguration,
@@ -303,6 +303,7 @@ public enum PassCode_2021 {
     ShowSapforTaskPackage, //временный проход на демонстрацию дерева файлов и версий пакета.
     OpenSapforEtalonVersion,
     OpenSapforVersion,
+    PublishServerSapfor,
 
     //->
     TestPass;
@@ -310,6 +311,10 @@ public enum PassCode_2021 {
         switch (this) {
             case Undefined:
                 return "?";
+            case PublishServerSapfor:
+                return "Опубликовать собранную версию SAPFOR";
+            case DeleteGroup:
+                return "Удалить группу";
             case UpdateProperty:
                 return "Обновить параметр";
             case OpenSapforEtalonVersion:
@@ -450,8 +455,6 @@ public enum PassCode_2021 {
                 return "Просмотр/Редактирование конфигурацию тестирования";
             case EditConfigurationOnServer:
                 return "Редактировать конфигурацию на сервере";
-            case DeleteSelectedGroups:
-                return "Удалить отмеченные группы";
             case SPF_GetMaxMinBlockDistribution:
                 return "Определить размерность теста по DVM директивам";
             case PauseTesting:
diff --git a/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java b/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java
new file mode 100644
index 00000000..4aa37815
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java
@@ -0,0 +1,40 @@
+package Visual_DVM_2021.Passes.Server;
+import Common.Database.riDBObject;
+import Repository.RepositoryServer;
+public class DeleteServerObject<S extends RepositoryServer, D extends riDBObject> extends ServerObjectPass<S, D> {
+    @Override
+    public String getIconPath() {
+        return "/icons/Delete.png";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        target = (D) getDb().tables.get(d).getCurrent();
+        return getDb().tables.get(d).CheckCurrent(Log) && getDb().tables.get(d).ShowDeleteObjectDialog(target);
+    }
+    //Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
+    @Override
+    protected void showPreparation() throws Exception {
+        getDb().tables.get(d).ClearUI();
+        for (Class dep : getDb().tables.get(d).getFKDependencies().keySet()) {
+            switch (getDb().tables.get(d).getFKDependencies().get(dep).data) {
+                case NONE:
+                case DROP:
+                    break;
+                case DELETE:
+                    getDb().tables.get(dep).ClearUI();
+                    break;
+            }
+        }
+    }
+    public DeleteServerObject(S server_in, Class<D> d_in) {
+        super(server_in, d_in);
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        DeleteObject(target);
+    }
+    @Override
+    protected void showDone() throws Exception {
+        getDb().tables.get(d).ui_.Show();
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/Server/EditServerObject.java b/src/Visual_DVM_2021/Passes/Server/EditServerObject.java
index 33877541..889ac007 100644
--- a/src/Visual_DVM_2021/Passes/Server/EditServerObject.java
+++ b/src/Visual_DVM_2021/Passes/Server/EditServerObject.java
@@ -1,8 +1,6 @@
 package Visual_DVM_2021.Passes.Server;
 import Common.Database.riDBObject;
 import Repository.RepositoryServer;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
 public class EditServerObject<S extends RepositoryServer, D extends riDBObject> extends ServerObjectPass<S, D> {
     //--
     @Override
@@ -22,6 +20,6 @@ public class EditServerObject<S extends RepositoryServer, D extends riDBObject>
     //--
     @Override
     protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", target));
+        EditObject(target);
     }
 }