группировка проходов с группами и тестами в выпадающие меню

.idea/workspace.xml

@@ -7,9 +7,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/AddGroupMenu.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/AddTestMenu.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/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.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/TestingSystem/Common/Test/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestsMenuBar.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/Main/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

src/TestingSystem/Common/Group/GroupsMenuBar.java

@@ -4,6 +4,7 @@ import Common.UI.Menus_2023.DataMenuBar;
 import Common.UI.Menus_2023.MenuBarButton;
 import Common.Utils.Utils;
 import TestingSystem.Common.Group.GroupsDBTable;
+import TestingSystem.Common.Group.UI.AddGroupMenu;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import javax.swing.*;
@@ -11,13 +12,10 @@ public class GroupsMenuBar extends DataMenuBar {
     public GroupsMenuBar() {
         super("группы",
                 PassCode_2021.SynchronizeTests,
-                PassCode_2021.ConvertCorrectnessTests,
+                PassCode_2021.ConvertCorrectnessTests
-                PassCode_2021.PublishGroup,
-                PassCode_2021.CreateGroupFromDirectory,
-                PassCode_2021.CreateGroupFromFiles,
-                PassCode_2021.EditGroup,
-                PassCode_2021.DeleteGroup
                 );
+        addMenus(new AddGroupMenu());
+        addPasses(PassCode_2021.EditGroup, PassCode_2021.DeleteGroup);
         add(new JSeparator());
         add(new MenuBarButton() {
             {

src/TestingSystem/Common/Group/UI/AddGroupMenu.java

@@ -0,0 +1,12 @@
+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());
+    }
+}

src/TestingSystem/Common/Test/TestsMenuBar.java

@@ -1,15 +1,12 @@
 package TestingSystem.Common.Test;
 import Common.UI.Menus_2023.DataMenuBar;
+import TestingSystem.Common.Test.UI.AddTestMenu;
+import TestingSystem.Common.Test.UI.EditTestMenu;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class TestsMenuBar extends DataMenuBar {
     public TestsMenuBar() {
-        super("тесты",
+        super("тесты");
-                PassCode_2021.CreateTestFromProject,
+        addMenus(new AddTestMenu(), new EditTestMenu());
-                PassCode_2021.CreateTestFromDirectory,
+        addPasses(PassCode_2021.DownloadTest,PassCode_2021.DeleteTest);
-                PassCode_2021.CreateTestsFromFiles, ///----------------------------
-                PassCode_2021.EditTest,
-                PassCode_2021.ReplaceTestProject,
-                PassCode_2021.DownloadTest,
-                PassCode_2021.DeleteTest);
     }
 }

src/TestingSystem/Common/Test/UI/AddTestMenu.java

@@ -0,0 +1,12 @@
+package TestingSystem.Common.Test.UI;
+import Common.UI.Menus_2023.VisualiserMenu;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
+public class AddTestMenu extends VisualiserMenu {
+    public AddTestMenu() {
+        super("Добавление теста", "/icons/RedAdd.png", false);
+        add(Pass_2021.passes.get(PassCode_2021.CreateTestFromProject).createMenuItem());
+        add(Pass_2021.passes.get(PassCode_2021.CreateTestFromDirectory).createMenuItem());
+        add(Pass_2021.passes.get(PassCode_2021.CreateTestsFromFiles).createMenuItem());
+    }
+}

src/TestingSystem/Common/Test/UI/EditTestMenu.java

@@ -0,0 +1,11 @@
+package TestingSystem.Common.Test.UI;
+import Common.UI.Menus_2023.VisualiserMenu;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
+public class EditTestMenu extends VisualiserMenu {
+    public EditTestMenu() {
+        super("Редактирование теста", "/icons/Edit.png", false);
+        add(Pass_2021.passes.get(PassCode_2021.EditTest).createMenuItem());
+        add(Pass_2021.passes.get(PassCode_2021.ReplaceTestProject).createMenuItem());
+    }
+}

src/Visual_DVM_2021/Passes/PassCode_2021.java

@@ -380,7 +380,7 @@ public enum PassCode_2021 {
             case SPF_RemoveComments:
                 return "Удаление комментариев";
             case CreateTestFromProject:
-                return "Создать тест из проекта";
+                return "Создать тест из текущего проекта";
             case CreateTestFromDirectory:
                 return "Создать тест из папки";
             case SPF_RemoveOmpDirectives:
@@ -550,7 +550,7 @@ public enum PassCode_2021 {
             case EditGroup:
                 return "Редактирование группы";
             case PublishGroup:
-                return "Опубликовать группу";
+                return "Создать пустую группу тестов";
             case DeleteSelectedCompilationTasks:
                 return "Удалить отмеченные задачи на компиляцию";
             case DeleteSelectedRunTasks:

src/Visual_DVM_2021/UI/Main/TestingForm.form

@@ -106,7 +106,7 @@
           </grid>
           <grid id="1f9bd" binding="dvmComparisonTab" layout-manager="BorderLayout" hgap="0" vgap="0">
             <constraints>
-              <tabbedpane title="Сравнение" icon="icons/Comparsion.png">
+              <tabbedpane title="Сравнение задач DVM" icon="icons/Comparsion.png">
                 <tooltip value="Сравнение пакетов тестирования DVM"/>
               </tabbedpane>
             </constraints>
@@ -264,7 +264,7 @@
           </grid>
           <grid id="4f7f1" binding="sapforComparisonTab" layout-manager="BorderLayout" hgap="0" vgap="0">
             <constraints>
-              <tabbedpane title="Сравнение" icon="icons/Comparsion.png">
+              <tabbedpane title="Сравнение пакетов SAPFOR" icon="icons/Comparsion.png">
                 <tooltip value="Сравнение пакетов тестирования SAPFOR"/>
               </tabbedpane>
             </constraints>