From 1489591c9e6c19f3d14e76daa619982018532a40 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 5 Oct 2023 00:50:36 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 55 ++-----------------
 .../ServerSapforsBar/ServerSapforsBar.java    |  2 +-
 .../Passes/All/DeleteServerSapfor.java        | 38 +++++++++++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  3 +
 4 files changed, 46 insertions(+), 52 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e11522d..d98915ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,57 +7,10 @@
   </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/All/DeleteServerSapfor.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/Common/Constants/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/iDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/iDBObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/DataSetControlForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/TableMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus/TableMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/ColumnInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Tables/ColumnInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/InterruptThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/InterruptThread.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/PathValidator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Validators/PathValidator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/ShellParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Validators/ShellParser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Credentials/Credentials.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Credentials/Credentials.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValue.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/Machine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/Machine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/Module.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/Module.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/ModuleAnchestor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/ModuleAnchestor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Splitter/Splitter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Splitter/Splitter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/CompilationTask/CompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/CompilationTask/CompilationTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Task.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/User.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Component.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Component.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforServerScenario_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforServerScenario_info.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadTask/ThreadTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadTask/ThreadTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestRunTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadRepository.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/All/OpenSapforTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Precompilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Precompilation.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProcessPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProcessPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ComparisonForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.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" />
@@ -156,11 +109,11 @@
       <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\Visual_DVM_2021\Passes\All" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
+      <recent name="Common.Constants" />
       <recent name="Common.Constants.Constants" />
       <recent name="Constants" />
       <recent name="Common.Utils.InterruptThread" />
       <recent name="Common.Utils.Utils" />
-      <recent name="Common.Global" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\Visual_DVM_2021\Passes\UI" />
diff --git a/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java b/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java
index 9a6eb7df..c5889322 100644
--- a/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java
+++ b/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java
@@ -3,6 +3,6 @@ import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class ServerSapforsBar extends DataMenuBar {
     public ServerSapforsBar() {
-        super("SAPFOR", PassCode_2021.InstallServerSapfor);
+        super("SAPFOR", PassCode_2021.InstallServerSapfor, PassCode_2021.DeleteServerSapfor);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java b/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java
new file mode 100644
index 00000000..9221cae5
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java
@@ -0,0 +1,38 @@
+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.TestingSystemPass;
+public class DeleteServerSapfor extends DeleteObjectPass<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);
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index c5397274..134a5edd 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes;
 public enum PassCode_2021 {
     Undefined,
     //-
+    DeleteServerSapfor,
     StartSapforTestsOnServer,
     InstallServerSapfor,
     SaveProfile,
@@ -312,6 +313,8 @@ public enum PassCode_2021 {
         switch (this) {
             case Undefined:
                 return "?";
+            case DeleteServerSapfor:
+                return "Удалить версию SAPFOR";
             case StartSapforTestsOnServer:
                 return "Запустить тестирование на сервере";
             case InstallServerSapfor: