From 07d35c876de9299b17ca42441966e625e7e39e63 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 17 Oct 2023 22:25:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B8=D0=BB=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6?=
 =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BE=D0=BF=D0=BE=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=20=D1=85=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B5=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=20=D0=BF=D0=BE=D1=87=D1=82?=
 =?UTF-8?q?=D0=B5=20(=20=D0=B2=20=D1=85=D0=BE=D0=B4=D0=B5=20=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=B0=D0=B4=D0=B0=D0=BB=D0=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 12 +++++------
 .../ConfigurationsMenuBar.java                | 18 -----------------
 .../UI/Menus_2023/TestingBar/TestingBar.java  | 16 +++++++++++++++
 src/ProjectData/Messages/Message.java         |  2 +-
 src/Repository/Component/Visualiser.java      |  2 +-
 .../UI/ConfigurationDBTable.java              |  1 -
 src/TestingSystem/TestingServer.java          | 13 +++++-------
 .../Passes/All/CheckAccount.java              | 20 +++++++++++++------
 .../Passes/All/StartTests.java                |  3 +--
 src/Visual_DVM_2021/UI/Main/CallbackForm.java |  4 +++-
 10 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c381bc9e..c266eb73 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,14 +8,14 @@
   <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/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.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/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.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/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Configuration/UI/ConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Configuration/UI/ConfigurationDBTable.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/Visual_DVM_2021/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckAccount.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/All/StartTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -115,11 +115,11 @@
       <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\files\Planner" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
+      <recent name="TestingSystem.TestingServer" />
       <recent name="Common.Constants" />
       <recent name="Common.Constants.Constants" />
       <recent name="Constants" />
       <recent name="Common.Utils.InterruptThread" />
-      <recent name="Common.Utils.Utils" />
     </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/ConfigurationsMenuBar/ConfigurationsMenuBar.java b/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java
index d6a3cbac..a9457a10 100644
--- a/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java
+++ b/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java
@@ -4,24 +4,6 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 public class ConfigurationsMenuBar extends DataMenuBar {
     public ConfigurationsMenuBar() {
         super("конфигурации");
-
-        /*
-        add(new MenuBarButton() {
-            {
-                setText("Оповещение по email");
-                setToolTipText("Оповещение о прогрессе выполнения пакета тестов");
-                Mark();
-                addActionListener(e -> {
-                    email = !email;
-                    Mark();
-                });
-            }
-            public void Mark() {
-                setIcon(Utils.getIcon(email ? "/icons/Pick.png" : "/icons/NotPick.png"));
-            }
-
-        });
-         */
         addPasses(
                 PassCode_2021.StartTests,
                 PassCode_2021.PublishConfiguration,
diff --git a/src/Common/UI/Menus_2023/TestingBar/TestingBar.java b/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
index 1cb65ba3..16991bfd 100644
--- a/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
+++ b/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
@@ -30,6 +30,22 @@ public class TestingBar extends VisualiserMenuBar {
             TestingServer.kernels = (int) sKernels.getValue();
         });
         //--
+        add(new MenuBarButton() {
+            {
+                setText("Оповещение по email");
+                setToolTipText("Оповещение о прогрессе выполнения пакета тестов");
+                Mark();
+                addActionListener(e -> {
+                    TestingServer.email = !TestingServer.email;
+                    Mark();
+                });
+            }
+            public void Mark() {
+                setIcon(Utils.getIcon(TestingServer.email ? "/icons/Pick.png" : "/icons/NotPick.png"));
+            }
+
+        });
+        //--
         add(autorefreshButton = new MenuBarButton() {
             {
                 setText("проверка раз в");
diff --git a/src/ProjectData/Messages/Message.java b/src/ProjectData/Messages/Message.java
index 1c9f4e00..e2a21a9a 100644
--- a/src/ProjectData/Messages/Message.java
+++ b/src/ProjectData/Messages/Message.java
@@ -427,7 +427,7 @@ public class Message extends FileObject {
                 group_s += "parser";
                 break;
             case Constants.compiler_group:
-                group_s = "compiler";
+                group_s += "compiler";
                 break;
             default:
                 group_s += group;
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index c67a26c4..9bce5afd 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 = 1021;
+        version = 1022;
         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/Configuration/UI/ConfigurationDBTable.java b/src/TestingSystem/Configuration/UI/ConfigurationDBTable.java
index b351b8f9..ce39df16 100644
--- a/src/TestingSystem/Configuration/UI/ConfigurationDBTable.java
+++ b/src/TestingSystem/Configuration/UI/ConfigurationDBTable.java
@@ -10,7 +10,6 @@ import Common.Utils.Utils;
 import TestingSystem.Configuration.Configuration;
 import TestingSystem.Configuration.ConfigurationInterface;
 public class ConfigurationDBTable extends DBTable<String, Configuration> {
-    public static boolean email = false;
     public ConfigurationDBTable() {
         super(String.class, Configuration.class);
     }
diff --git a/src/TestingSystem/TestingServer.java b/src/TestingSystem/TestingServer.java
index 916d0ed2..f798f541 100644
--- a/src/TestingSystem/TestingServer.java
+++ b/src/TestingSystem/TestingServer.java
@@ -43,6 +43,10 @@ import java.util.stream.Collectors;
 
 import static TestingSystem.TasksDatabase.tests_db_name;
 public class TestingServer extends RepositoryServer<TestsDatabase> {
+    public static boolean email = false;
+    public static boolean checkTasks = false;
+    public static int checkIntervalSecond = 10;
+    public static int kernels = 4;
     LinkedHashMap<String, TasksDatabase> accountsBases = new LinkedHashMap<>();
     //--------------------------------->>>
     public TestingServer() {
@@ -215,23 +219,17 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     protected TestingPlanner testingPlanner = new TestingPlanner();
     protected Thread testingThread = new Thread(() -> testingPlanner.Perform());
     //------>>>
-    public static boolean checkTasks = false;
-    //--
     public static void switchTimer(boolean on) {
         if (on)
             TimerOn();
         else
             TimerOff();
     }
-    //----
-    public static int checkIntervalSecond = 10;
-    public static int kernels = 4;
-    //----
     public static Timer checkTimer = null;
     public static void TimerOn() {
         checkTasks = true;
         checkTimer = new Timer(checkIntervalSecond * 1000, e -> {
-        //    Pass_2021.passes.get(PassCode_2021.ActualizePackages).Do();
+            //    Pass_2021.passes.get(PassCode_2021.ActualizePackages).Do();
             Pass_2021.passes.get(PassCode_2021.SynchronizeTestsTasks).Do();
         });
         checkTimer.start();
@@ -308,7 +306,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         groups.sort(Comparator.comparing(o -> o.description));
         return groups;
     }
-
     @Override
     protected void Session() throws Exception {
         DBObject dbObject = null;
diff --git a/src/Visual_DVM_2021/Passes/All/CheckAccount.java b/src/Visual_DVM_2021/Passes/All/CheckAccount.java
index 0cd1d926..0f5b6689 100644
--- a/src/Visual_DVM_2021/Passes/All/CheckAccount.java
+++ b/src/Visual_DVM_2021/Passes/All/CheckAccount.java
@@ -3,7 +3,12 @@ import Common.Current;
 import Common.UI.UI;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
-public class CheckAccount extends Pass_2021 {
+public class CheckAccount extends Pass_2021<Boolean> {
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        target = false;
+        return true;
+    }
     @Override
     public String getIconPath() {
         return "/icons/Registry.png";
@@ -14,11 +19,14 @@ public class CheckAccount extends Pass_2021 {
     }
     @Override
     protected void body() throws Exception {
-        if (Current.getAccount().email.equals("?")) {
-            if (Pass_2021.passes.get(PassCode_2021.EditAccount).Do())
-                Pass_2021.passes.get(PassCode_2021.CheckRegistrationOnServer).Do();
-        } else
-            Pass_2021.passes.get(PassCode_2021.CheckRegistrationOnServer).Do();
+        target = Current.getAccount().email.equals("?") ?
+                (Pass_2021.passes.get(PassCode_2021.EditAccount).Do() &&
+                        Pass_2021.passes.get(PassCode_2021.CheckRegistrationOnServer).Do()) :
+                (Pass_2021.passes.get(PassCode_2021.CheckRegistrationOnServer).Do());
+    }
+    @Override
+    protected boolean validate() {
+        return target;
     }
     @Override
     protected void showDone() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/StartTests.java b/src/Visual_DVM_2021/Passes/All/StartTests.java
index 3445926c..e7d5a36a 100644
--- a/src/Visual_DVM_2021/Passes/All/StartTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartTests.java
@@ -7,7 +7,6 @@ import GlobalData.User.UserState;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.Configuration.ConfigurationInterface;
-import TestingSystem.Configuration.UI.ConfigurationDBTable;
 import TestingSystem.Group.Group;
 import TestingSystem.Group.GroupInterface;
 import TestingSystem.Tasks.TestCompilationTask;
@@ -201,7 +200,7 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
                 "Задач на компиляцию: " + target.compilationTasksCount + "\n" +
                         "Задач на запуск: " + target.runTasksCount + "\n" +
                         String.join("\n", summary_lines);
-        target.needsEmail = ConfigurationDBTable.email ? 1 : 0;
+        target.needsEmail = TestingServer.email ? 1 : 0;
         return !tasks.isEmpty();
     }
     @Override
diff --git a/src/Visual_DVM_2021/UI/Main/CallbackForm.java b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
index 9583749f..465cd84c 100644
--- a/src/Visual_DVM_2021/UI/Main/CallbackForm.java
+++ b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
@@ -164,8 +164,10 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         Global.componentsServer.db.subscribers.mountUI(subscribersPanel);
         settingsTools.add(Pass_2021.passes.get(PassCode_2021.ApplyBugReportSettings).createButton());
         //-
-        if (!Pass_2021.passes.get(PassCode_2021.CheckAccount).isDone())
+        if (!Pass_2021.passes.get(PassCode_2021.CheckAccount).isDone()) {
             accountTools.add(Pass_2021.passes.get(PassCode_2021.CheckAccount).createButton());
+            UI.Info("+");
+        }
         //--
         BugReportsKeyFilter.getDocument().addDocumentListener(new DocumentListener() {
             @Override