From 431d23f4275ceeea4b2eb89aee2b7a3868e07e56 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 13 Mar 2024 21:17:32 +0300
Subject: [PATCH] =?UTF-8?q?v++,=20=D0=BF=D0=B5=D1=80=D0=B5=D1=82=D0=B0?=
 =?UTF-8?q?=D1=81=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=B2=D0=BA=D0=BB=D0=B0=D0=B4?=
 =?UTF-8?q?=D0=BA=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 27 +++++++------------
 src/Common/UI/Menus_2023/VisualiserMenu.java  |  6 +++++
 src/Repository/Component/Visualiser.java      |  2 +-
 .../Common/Group/UI/AddGroupMenu.java         |  7 ++---
 .../Common/Group/UI/EditGroupMenu.java        |  5 ++--
 .../DVM/DVMPackage/DVMPackagesBar.java        | 26 ++++++++++--------
 .../DVM/DVMPackage/UI/AddDVMPackageMenu.java  | 11 ++++++++
 .../DVM/DVMPackage/UI/EditDVMPackageMenu.java |  9 +++++++
 .../UI/AddSapforPackageMenu.java              |  9 +++++++
 .../UI/SapforPackagesBar.java                 | 19 ++++++-------
 .../Passes/All/AddDVMPackage.java             |  4 +++
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  4 +--
 12 files changed, 80 insertions(+), 49 deletions(-)
 create mode 100644 src/TestingSystem/DVM/DVMPackage/UI/AddDVMPackageMenu.java
 create mode 100644 src/TestingSystem/DVM/DVMPackage/UI/EditDVMPackageMenu.java
 create mode 100644 src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 35f29488..75e62249 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,26 +7,17 @@
   </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/CreateDVMPackageFromCurrentProject.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/UI/AddDVMPackageMenu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/UI/EditDVMPackageMenu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.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/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java" afterDir="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/Common/UI/Menus_2023/VisualiserMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VisualiserMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/AddGroupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/AddGroupMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/EditGroupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/EditGroupMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.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/CredentialsWindow.java" beforeDir="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/CredentialsForm.form" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CredentialsForm.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" 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/Visual_DVM_2021/UI/Main/buffer_.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/UI/Menus_2023/VisualiserMenu.java b/src/Common/UI/Menus_2023/VisualiserMenu.java
index e7eae0fa..818752e4 100644
--- a/src/Common/UI/Menus_2023/VisualiserMenu.java
+++ b/src/Common/UI/Menus_2023/VisualiserMenu.java
@@ -2,6 +2,8 @@ package Common.UI.Menus_2023;
 import Common.Current;
 import Common.UI.Themes.VisualiserFonts;
 import Common.Utils.Utils;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
 
 import javax.swing.*;
 import java.awt.*;
@@ -18,4 +20,8 @@ public class VisualiserMenu extends JMenu {
     public VisualiserMenu(String text, String iconPath) {
         this(text, iconPath, false);
     }
+    public void addPasses(PassCode_2021... codes) {
+        for (PassCode_2021 code : codes)
+            add(Pass_2021.passes.get(code).createMenuItem());
+    }
 }
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 046eddcd..d25acd02 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1076;
+        version = 1077;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/TestingSystem/Common/Group/UI/AddGroupMenu.java b/src/TestingSystem/Common/Group/UI/AddGroupMenu.java
index 44792c6c..d3195399 100644
--- a/src/TestingSystem/Common/Group/UI/AddGroupMenu.java
+++ b/src/TestingSystem/Common/Group/UI/AddGroupMenu.java
@@ -1,12 +1,9 @@
 package TestingSystem.Common.Group.UI;
 import Common.UI.Menus_2023.VisualiserMenu;
 import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
 public class AddGroupMenu extends VisualiserMenu {
     public AddGroupMenu() {
-        super("Добавление группы", "/icons/RedAdd.png", false);
-        add(Pass_2021.passes.get(PassCode_2021.PublishGroup).createMenuItem());
-        add(Pass_2021.passes.get(PassCode_2021.CreateGroupFromDirectory).createMenuItem());
-        add(Pass_2021.passes.get(PassCode_2021.CreateGroupFromFiles).createMenuItem());
+        super("", "/icons/RedAdd.png");
+        addPasses(PassCode_2021.PublishGroup,PassCode_2021.CreateGroupFromDirectory,PassCode_2021.CreateGroupFromFiles);
     }
 }
diff --git a/src/TestingSystem/Common/Group/UI/EditGroupMenu.java b/src/TestingSystem/Common/Group/UI/EditGroupMenu.java
index b8200d13..7c3ce658 100644
--- a/src/TestingSystem/Common/Group/UI/EditGroupMenu.java
+++ b/src/TestingSystem/Common/Group/UI/EditGroupMenu.java
@@ -4,8 +4,7 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class EditGroupMenu extends VisualiserMenu {
     public EditGroupMenu() {
-        super("Редактирование группы", "/icons/Edit.png", false);
-        add(Pass_2021.passes.get(PassCode_2021.EditGroup).createMenuItem());
-        add(Pass_2021.passes.get(PassCode_2021.ReplaceTestsFromFiles).createMenuItem());
+        super("", "/icons/Edit.png" );
+        addPasses(PassCode_2021.EditGroup, PassCode_2021.ReplaceTestsFromFiles);
     }
 }
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
index 275606da..e03b8da2 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
@@ -3,23 +3,27 @@ import Common.Global;
 import Common.UI.Menus_2023.DataMenuBar;
 import Common.UI.Menus_2023.MenuBarButton;
 import Common.Utils.Utils;
+import TestingSystem.Common.Group.UI.AddGroupMenu;
+import TestingSystem.Common.Group.UI.EditGroupMenu;
+import TestingSystem.DVM.DVMPackage.UI.AddDVMPackageMenu;
+import TestingSystem.DVM.DVMPackage.UI.EditDVMPackageMenu;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import javax.swing.*;
 public class DVMPackagesBar extends DataMenuBar {
     public DVMPackagesBar() {
-        super("пакеты задач DVM",
-                PassCode_2021.SynchronizeTests,
-                PassCode_2021.AddDVMPackage,
-                PassCode_2021.AddTasksToDVMPackage,
-                PassCode_2021.CloneDVMPackage,
-                PassCode_2021.StartDVMPackage,
-                PassCode_2021.DownloadDVMPackage,
-                PassCode_2021.AbortDVMPackage,
-                PassCode_2021.DeleteDVMPackage,
-                PassCode_2021.ExportDVMPackageToExcel
-        );
+        super("пакеты задач DVM");
+        addPasses(PassCode_2021.SynchronizeTests);
+        addSeparator();
+        addMenus(new AddDVMPackageMenu());
+        addPasses(PassCode_2021.AddTasksToDVMPackage,PassCode_2021.DeleteDVMPackage);
+        addSeparator();
+        addPasses(PassCode_2021.StartDVMPackage,
+                PassCode_2021.AbortDVMPackage);
+        addSeparator();
+        addPasses(PassCode_2021.DownloadDVMPackage,
+                PassCode_2021.ExportDVMPackageToExcel);
         add(new JSeparator());
         add(new MenuBarButton() {
             {
diff --git a/src/TestingSystem/DVM/DVMPackage/UI/AddDVMPackageMenu.java b/src/TestingSystem/DVM/DVMPackage/UI/AddDVMPackageMenu.java
new file mode 100644
index 00000000..1507109e
--- /dev/null
+++ b/src/TestingSystem/DVM/DVMPackage/UI/AddDVMPackageMenu.java
@@ -0,0 +1,11 @@
+package TestingSystem.DVM.DVMPackage.UI;
+import Common.UI.Menus_2023.VisualiserMenu;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
+public class AddDVMPackageMenu extends VisualiserMenu {
+    public AddDVMPackageMenu() {
+        super("", "/icons/RedAdd.png");
+        addPasses(PassCode_2021.AddDVMPackage,
+                  PassCode_2021.CloneDVMPackage);
+    }
+}
diff --git a/src/TestingSystem/DVM/DVMPackage/UI/EditDVMPackageMenu.java b/src/TestingSystem/DVM/DVMPackage/UI/EditDVMPackageMenu.java
new file mode 100644
index 00000000..548e9fac
--- /dev/null
+++ b/src/TestingSystem/DVM/DVMPackage/UI/EditDVMPackageMenu.java
@@ -0,0 +1,9 @@
+package TestingSystem.DVM.DVMPackage.UI;
+import Common.UI.Menus_2023.VisualiserMenu;
+import Visual_DVM_2021.Passes.PassCode_2021;
+public class EditDVMPackageMenu extends VisualiserMenu {
+    public EditDVMPackageMenu() {
+        super("",  "/icons/Edit.png");
+        addPasses(PassCode_2021.AddTasksToDVMPackage);
+    }
+}
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java
new file mode 100644
index 00000000..675f5768
--- /dev/null
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java
@@ -0,0 +1,9 @@
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
+import Common.UI.Menus_2023.VisualiserMenu;
+import Visual_DVM_2021.Passes.PassCode_2021;
+public class AddSapforPackageMenu extends VisualiserMenu {
+    public AddSapforPackageMenu() {
+        super("", "/icons/RedAdd.png");
+        addPasses(PassCode_2021.AddSapforPackage,PassCode_2021.CloneSapforPackage);
+    }
+}
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
index 951106a8..ad4e9475 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
@@ -3,23 +3,24 @@ import Common.Global;
 import Common.UI.Menus_2023.DataMenuBar;
 import Common.UI.Menus_2023.MenuBarButton;
 import Common.Utils.Utils;
-import TestingSystem.Common.Group.GroupsDBTable;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import javax.swing.*;
 public class SapforPackagesBar extends DataMenuBar {
     public SapforPackagesBar() {
-        super("пакеты задач SAPFOR",
-                PassCode_2021.SynchronizeTests,
-                PassCode_2021.CompareSapforPackages,
-                PassCode_2021.AddSapforPackage,
-                PassCode_2021.AddTasksToSapforPackage,
-                PassCode_2021.CloneSapforPackage,
+        super("пакеты задач SAPFOR");
+        addPasses(PassCode_2021.SynchronizeTests);
+        addSeparator();
+        addMenus(new AddSapforPackageMenu());
+        addPasses(PassCode_2021.AddTasksToSapforPackage, PassCode_2021.DeleteSapforPackage);
+        addSeparator();
+        addPasses(
                 PassCode_2021.StartSapforPackage,
-                PassCode_2021.AbortSapforPackage,
-                PassCode_2021.DeleteSapforPackage
+                PassCode_2021.AbortSapforPackage
         );
+        addSeparator();
+        addPasses(PassCode_2021.CompareSapforPackages);
         add(new JSeparator());
         add(new MenuBarButton() {
             {
diff --git a/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java b/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
index 7c9197c8..1f31c3b9 100644
--- a/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
@@ -16,6 +16,10 @@ public class AddDVMPackage extends AddObjectPass<DVMPackage> {
         super(DVMPackage.class);
     }
     @Override
+    public String getIconPath() {
+        return "/icons/CreateProject.png";
+    }
+    @Override
     protected Database getDb() {
         return Global.testingServer.db;
     }
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index bf145ffd..a6145f30 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -360,7 +360,7 @@ public enum PassCode_2021 {
             case DeleteSapforPackage:
                 return "Удалить пакеты тестирования SAPFOR";
             case AddSapforPackage:
-                return "Добавить пакет задач SAPFOR";
+                return "Создать пустой пакет";
             case AbortDVMPackage:
                 return "Прервать пакет тестирования DVM";
             case DeleteDVMPackage:
@@ -372,7 +372,7 @@ public enum PassCode_2021 {
             case AddTasksToDVMPackage:
                 return "Добавить задачи в пакет тестирования DVM";
             case AddDVMPackage:
-                return "Добавить пакет тестирования DVM";
+                return "Создать пустой пакет";
             case ActualizePackages:
                 return "Обновить пакеты задач";
             case ActualizeDVMPackages: