From dbc05900ba6e9cd99c6ca0d4ed7f0e66c3869fac Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 21 Dec 2023 17:42:20 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=203=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA=20=D1=81?=
 =?UTF-8?q?=D0=B8=D0=BD=D1=85=D1=80=D0=BE=D0=BD=D0=B8=D0=B7=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D0=B1=D0=B4=20=D1=82=D0=B5=D1=81=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2=20-=20=D0=B2=20=D1=82=D0=B5=D1=81=D1=82=D0=B0=D1=85.=20?=
 =?UTF-8?q?=D0=B8=20=D0=B2=20=D1=81=D0=BE=D0=BE=D1=82=D0=B2=D0=B5=D1=82?=
 =?UTF-8?q?=D1=81=D1=82=D0=B2=D1=83=D1=8E=D1=89=D0=B8=D1=85=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D1=8F?=
 =?UTF-8?q?=D1=85.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                   | 11 +++++++++--
 src/Common/UI/UI.java                                 |  2 +-
 src/TestingSystem/Common/Group/GroupsMenuBar.java     |  1 +
 .../Common}/TestingBar.java                           |  8 +-------
 src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java  |  4 +++-
 .../SAPFOR/SapforPackage/SapforPackagesBar.java       |  1 +
 .../Passes/All/CreateTestFromSelectedFiles.java       |  4 ++++
 src/Visual_DVM_2021/Passes/All/SynchronizeTests.java  |  6 ++++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java         |  3 +++
 9 files changed, 29 insertions(+), 11 deletions(-)
 rename src/{Common/UI/Menus_2023/TestingBar => TestingSystem/Common}/TestingBar.java (95%)
 create mode 100644 src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5df32c8e..1588b357 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.form" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.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/UI/Menus_2023/TestingBar/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.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/TestingSystem/Common/Group/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.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/SapforPackage/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.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/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" />
diff --git a/src/Common/UI/UI.java b/src/Common/UI/UI.java
index 63dca301..04f7a5d6 100644
--- a/src/Common/UI/UI.java
+++ b/src/Common/UI/UI.java
@@ -24,7 +24,7 @@ import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationsMenuBar;
 import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsBar;
 import Repository.SubscriberWorkspace.SubscriberWorkspacesMenuBar;
 import Repository.Subscribes.SubscribersMenuBar;
-import Common.UI.Menus_2023.TestingBar.TestingBar;
+import TestingSystem.Common.TestingBar;
 import TestingSystem.Common.Test.TestsMenuBar;
 import GlobalData.User.UsersMenuBar;
 import Common.UI.Menus_2023.VariantsMenuBar.VariantsMenuBar;
diff --git a/src/TestingSystem/Common/Group/GroupsMenuBar.java b/src/TestingSystem/Common/Group/GroupsMenuBar.java
index 7501d034..1440f636 100644
--- a/src/TestingSystem/Common/Group/GroupsMenuBar.java
+++ b/src/TestingSystem/Common/Group/GroupsMenuBar.java
@@ -10,6 +10,7 @@ import javax.swing.*;
 public class GroupsMenuBar extends DataMenuBar {
     public GroupsMenuBar() {
         super("группы",
+                PassCode_2021.SynchronizeTests,
                 PassCode_2021.ConvertCorrectnessTests,
                 PassCode_2021.PublishGroup,
                 PassCode_2021.CreateGroupFromDirectory,
diff --git a/src/Common/UI/Menus_2023/TestingBar/TestingBar.java b/src/TestingSystem/Common/TestingBar.java
similarity index 95%
rename from src/Common/UI/Menus_2023/TestingBar/TestingBar.java
rename to src/TestingSystem/Common/TestingBar.java
index 5f3a5bee..7ff3676d 100644
--- a/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
+++ b/src/TestingSystem/Common/TestingBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.TestingBar;
+package TestingSystem.Common;
 import Common.Current;
 import Common.Global;
 import Common.UI.Menus_2023.MenuBarButton;
@@ -14,18 +14,12 @@ import java.awt.*;
 public class TestingBar extends VisualiserMenuBar {
     public MenuBarButton MachineButton;
     public MenuBarButton UserButton;
-
- //   public JLabel MachineLabel;
- //   public JLabel UserLabel;
     public JLabel KernelsLabel;
 
     public JButton autorefreshButton;
     JSpinner sCheckTime;
     JSpinner sKernels;
     public TestingBar() {
-        addPasses(PassCode_2021.SynchronizeTests);
-        //--
-     //   AddLabel("машина: ", "/icons/Machine.png");
         add(MachineButton = new MenuBarButton() {
             {
                 setIcon("/icons/Machine.png");
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
index fc407dea..c1e1c69a 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
@@ -3,7 +3,9 @@ import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class DVMPackagesBar extends DataMenuBar {
     public DVMPackagesBar() {
-        super("пакеты задач DVM", PassCode_2021.AddDVMPackage,
+        super("пакеты задач DVM",
+                PassCode_2021.SynchronizeTests,
+                PassCode_2021.AddDVMPackage,
                 PassCode_2021.AddTasksToDVMPackage,
                 PassCode_2021.StartDVMPackage,
                 PassCode_2021.DownloadDVMPackage,
diff --git a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java
index 950ad2c1..fc869c70 100644
--- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java
+++ b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java
@@ -4,6 +4,7 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforPackagesBar extends DataMenuBar {
     public SapforPackagesBar() {
         super("пакеты задач SAPFOR",
+                PassCode_2021.SynchronizeTests,
                 PassCode_2021.AddSapforPackage,
                 PassCode_2021.StartSapforPackage,
                 PassCode_2021.AbortSapforPackage,
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java
new file mode 100644
index 00000000..5863be77
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java
@@ -0,0 +1,4 @@
+package Visual_DVM_2021.Passes.All;
+import Visual_DVM_2021.Passes.Pass_2021;
+public class CreateTestFromSelectedFiles extends Pass_2021 {
+}
diff --git a/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java b/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java
index 98718604..2a802b84 100644
--- a/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java
+++ b/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
+import Common.UI.Menus_2023.PassButton;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import Repository.Server.ServerCode;
@@ -7,6 +8,7 @@ import Repository.Server.ServerExchangeUnit_2021;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 import org.apache.commons.io.FileUtils;
 
+import javax.swing.*;
 import java.io.File;
 public class SynchronizeTests extends TestingSystemPass<Object> {
     File new_db_file;
@@ -23,6 +25,10 @@ public class SynchronizeTests extends TestingSystemPass<Object> {
         return "";
     }
     @Override
+    public JButton createButton() {
+        return new PassButton(this);
+    }
+    @Override
     protected void showPreparation() throws Exception {
         server.db.SaveLastSelections();
         server.db.configurations.ClearUI();
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 374ce5c4..2ae574d9 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -284,6 +284,7 @@ public enum PassCode_2021 {
     //--
     CreateGroupFromDirectory,
     CreateTestFromDirectory,
+    CreateTestFromSelectedFiles, //NEW
     CreateTestFromProject,
     SPF_RemoveComments,
     CreateTestFromFile,
@@ -315,6 +316,8 @@ public enum PassCode_2021 {
         switch (this) {
             case Undefined:
                 return "?";
+            case CreateTestFromSelectedFiles:
+                return "Создать тест из выделенных файлов";
             case DownloadSapforPackage:
                 return "Синхронизация пакета SAPFOR";
             case DownloadDVMPackages: