From e9bd430d56adee73f1d62d6cf024113064bd9f84 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 8 Oct 2023 01:15:49 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 40 +------------------
 .../SapforTasksPackagesBar.java               |  2 +-
 ...rio.java => DeleteSapforTasksPackage.java} |  6 +--
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  4 +-
 4 files changed, 7 insertions(+), 45 deletions(-)
 rename src/Visual_DVM_2021/Passes/All/{DeleteSapforScenario.java => DeleteSapforTasksPackage.java} (88%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cf1ad8a6..f9f53d3c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,47 +8,9 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/RemoteSapforsMenuBar/RemoteSapforsMenuBar.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforScenariosBar/SapforScenariosBar.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksMenuBar/SapforTasksMenuBar.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.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/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/RemoteSapfor/RemoteSapfor.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/RemoteSapfor/RemoteSapforsDBTable.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/RemoteSapfor/UI/RemoteSapforFields.form" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/RemoteSapfor/UI/RemoteSapforFields.java" beforeDir="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/Json/PackageModeScenario_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksPackage_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforScenarioResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksResults_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenario/SapforScenario.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenarioSupervisor/SapforScenarioSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.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/SapforTask/SapforTaskResult.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.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/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ServerSapforTestingPlanner/ServerSapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/ServerSapforTestingPlanner/ServerSapforTestingPlanner.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/TestingSystem/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddSapfor.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapfor.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapfor.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.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/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java b/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
index 384640dd..56ad5fda 100644
--- a/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
+++ b/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
@@ -3,6 +3,6 @@ import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforTasksPackagesBar extends DataMenuBar {
     public SapforTasksPackagesBar() {
-        super("сценарии", PassCode_2021.DeleteSapforScenario);
+        super("пакеты задач", PassCode_2021.DeleteSapforTasksPackage);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.java b/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
similarity index 88%
rename from src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.java
rename to src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
index c8109f55..ff36dbe6 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
@@ -10,8 +10,8 @@ import Visual_DVM_2021.Passes.Pass_2021;
 import Visual_DVM_2021.Passes.TestingSystemPass;
 
 import java.io.File;
-public class DeleteSapforScenario extends DeleteObjectPass<SapforTasksPackage> {
-    public DeleteSapforScenario() {
+public class DeleteSapforTasksPackage extends DeleteObjectPass<SapforTasksPackage> {
+    public DeleteSapforTasksPackage() {
         super(SapforTasksPackage.class);
     }
     @Override
@@ -37,7 +37,7 @@ public class DeleteSapforScenario extends DeleteObjectPass<SapforTasksPackage> {
         Pass_2021 serverPass = new TestingSystemPass<SapforTasksPackage>() {
             @Override
             public String getDescription() {
-                return "Удаление сценария задач SAPFOR с сервера";
+                return "Удаление пакета задач SAPFOR с сервера";
             }
             @Override
             protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 05fd1667..14e8ef6e 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -13,7 +13,7 @@ public enum PassCode_2021 {
     EditProfile,
     DeleteProfile,
     //-
-    DeleteSapforScenario,
+    DeleteSapforTasksPackage,
     //-
     //-
     CheckAccount,
@@ -312,7 +312,7 @@ public enum PassCode_2021 {
                 return "Отобразить все параллельные варианты";
             case ShowParallelVariantsCoverage:
                 return "Отобразить минимальное покрытие параллельных вариантов";
-            case DeleteSapforScenario:
+            case DeleteSapforTasksPackage:
                 return "Удалить сценарий SAPFOR";
             case DeleteServerSapfor:
                 return "Удалить версию SAPFOR";