From cbaa99345b26765c0e76e936a5e52fb6eadbdba9 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 17 Oct 2023 19:16:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=95=D1=81=D0=BB=D0=B8=20=D1=81=20=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B2=D0=BE=D0=B3=D0=BE=20=D1=80=D0=B0=D0=B7=D0=B0?=
 =?UTF-8?q?=20=D0=BD=D0=B5=20=D1=83=D0=B4=D0=B0=D0=BB=D0=BE=D1=81=D1=8C=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=B8=D1=82=D1=8C=20=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86=D0=B8=D1=8E,?=
 =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D0=B8=20=D0=BE?=
 =?UTF-8?q?=D0=B1=D1=80=D0=B0=D1=82=D0=BD=D0=BE=D0=B9=20=D1=81=D0=B2=D1=8F?=
 =?UTF-8?q?=D0=B7=D0=B8=20=D0=B2=D0=BA=D0=BB=D1=8E=D1=87=D0=B0=D0=B5=D1=82?=
 =?UTF-8?q?=D1=81=D1=8F=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=B2=D1=82=D0=BE=D1=80=D0=BD=D0=BE=D0=B9=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8.=20=D0=98=20=D1=82=D0=B0?=
 =?UTF-8?q?=D0=BA=20=D0=B4=D0=BE=20=D0=BF=D0=B5=D1=80=D0=B2=D0=BE=D0=B9=20?=
 =?UTF-8?q?=D1=83=D1=81=D0=BF=D0=B5=D1=88=D0=BD=D0=BE=D0=B9,=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=B8=D1=81=D1=87=D0=B5=D0=B7=D0=BD=D0=B5=D1=82.=20=D0=94?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D1=8F=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B0=20?=
 =?UTF-8?q?=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                 | 12 ++++++++++--
 src/Common/Constants.java                           |  2 ++
 src/ProjectData/Files/DBProjectFile.java            |  6 +++---
 src/ProjectData/Messages/Message.java               | 13 +++++++------
 .../PackageModeSupervisor.java                      | 13 -------------
 src/SapforTestingSystem/PerformSapforTask.java      |  3 ++-
 src/TestingSystem/TestingServer.java                |  4 ----
 src/Visual_DVM_2021/Passes/All/CheckAccount.java    |  1 +
 src/Visual_DVM_2021/Passes/All/Precompilation.java  |  3 +--
 src/Visual_DVM_2021/UI/Main/CallbackForm.java       |  4 +++-
 10 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1d670e7b..c381bc9e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,16 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.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/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/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/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/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" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Constants.java b/src/Common/Constants.java
index 221444cf..9e871859 100644
--- a/src/Common/Constants.java
+++ b/src/Common/Constants.java
@@ -36,6 +36,8 @@ public class Constants {
             PassCode_2021.SPF_SharedMemoryParallelization,
             PassCode_2021.SPF_InsertDvmhRegions
     };
+    public static final int parser_group = -1;
+    public static final int compiler_group = -2;
     //--
     //https://losst.ru/komandy-terminala-linux
     public static String[] linux_system_commands = new String[]{
diff --git a/src/ProjectData/Files/DBProjectFile.java b/src/ProjectData/Files/DBProjectFile.java
index cb23afd5..cb6c43e8 100644
--- a/src/ProjectData/Files/DBProjectFile.java
+++ b/src/ProjectData/Files/DBProjectFile.java
@@ -301,11 +301,11 @@ public class DBProjectFile extends DBObject {
         for (String S : nw) {
             Pair<Integer, String> p = decodeParserMessage(S, name);
             if (S.toLowerCase().startsWith("note")) {
-                father.db.files.Data.get(p.getValue()).CreateAndAddNewMessage(2, S, p.getKey(), Message.parser_group);
+                father.db.files.Data.get(p.getValue()).CreateAndAddNewMessage(2, S, p.getKey(), Constants.parser_group);
             } else if (S.toLowerCase().startsWith("warning")) {
-                father.db.files.Data.get(p.getValue()).CreateAndAddNewMessage(0, S, p.getKey(), Message.parser_group);
+                father.db.files.Data.get(p.getValue()).CreateAndAddNewMessage(0, S, p.getKey(), Constants.parser_group);
             } else if (S.toLowerCase().startsWith("error"))
-                father.db.files.Data.get(p.getValue()).CreateAndAddNewMessage(1, S, p.getKey(), Message.parser_group);
+                father.db.files.Data.get(p.getValue()).CreateAndAddNewMessage(1, S, p.getKey(), Constants.parser_group);
         }
     }
     public void ReadParseMessages() throws Exception {
diff --git a/src/ProjectData/Messages/Message.java b/src/ProjectData/Messages/Message.java
index d9bcb286..1c9f4e00 100644
--- a/src/ProjectData/Messages/Message.java
+++ b/src/ProjectData/Messages/Message.java
@@ -1,17 +1,15 @@
 package ProjectData.Messages;
+import Common.Constants;
 import Common.Current;
 import Common.Global;
 import GlobalData.Settings.SettingName;
 import ProjectData.SapforData.FileObject;
 import ProjectData.SapforData.FileObjectWithMessages;
 import Visual_DVM_2021.Passes.PassException;
-import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.HashMap;
 import java.util.Map;
 public class Message extends FileObject {
-    @Description("IGNORE")
-    public static final int parser_group = -1;
     private static HashMap<String, String> codedMessages;
     private static HashMap<String, String> codedMessages2;
     public int group;
@@ -24,7 +22,7 @@ public class Message extends FileObject {
         file = file_in;
         line = line_in;
         setGroup(group_in);
-        if ((group == parser_group) || (Current.mode != Current.Mode.Normal)) {
+        if ((group == Constants.parser_group) || (Current.mode != Current.Mode.Normal)) {
             value = value_in;
         } else {
             value = !Global.getSetting(SettingName.TRANSLATE_MESSAGES).toBoolean() ? value_in : decodeRussianMessage(value_in);
@@ -389,7 +387,7 @@ public class Message extends FileObject {
                         }
                     } while (idx != -1);
                     if (sum != splited.length && !message.equals(""))
-                        throw new PassException("Ошибка при декодировании собщений на русском языке");
+                        throw new PassException("Ошибка при декодировании сообщений на русском языке");
                     idx = 0;
                     String result = "";
                     for (int z = 0; z < sum; ++z) {
@@ -425,9 +423,12 @@ public class Message extends FileObject {
             case 0:
                 group_s += "m0000";
                 break;
-            case parser_group: //сообщения от парсера.
+            case Constants.parser_group: //сообщения от парсера.
                 group_s += "parser";
                 break;
+            case Constants.compiler_group:
+                group_s = "compiler";
+                break;
             default:
                 group_s += group;
                 break;
diff --git a/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java b/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
index 7e3a45c2..e883ee16 100644
--- a/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
+++ b/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
@@ -42,19 +42,6 @@ public class PackageModeSupervisor extends ThreadsPlanner {
         interruptThread.start();
     }
     @Override
-    public void Interrupt() throws Exception {
-        /*
-        System.out.println("killing " + package_json.sapfor_drv + "...");
-        String kill_command = Global.isWindows ? ("taskkill /FI \"IMAGENAME eq " + package_json.sapfor_drv + "\" /F /T") :
-                ("killall -SIGKILL " + package_json.sapfor_drv);
-        Process killer = Runtime.getRuntime().exec(kill_command);
-        killer.waitFor();
-        System.out.println("done!");
-         */
-        //todo для надежности сделать еще один kill с внешнего процесса.
-        // может быть гонка, что нить успеет запустить процесс уже после интеррупта.
-    }
-    @Override
     protected void finalize() {
         results_json.EndDate = new Date().getTime();
         //записать результаты всех задач.
diff --git a/src/SapforTestingSystem/PerformSapforTask.java b/src/SapforTestingSystem/PerformSapforTask.java
index 3fee0c49..7a9a2241 100644
--- a/src/SapforTestingSystem/PerformSapforTask.java
+++ b/src/SapforTestingSystem/PerformSapforTask.java
@@ -3,7 +3,6 @@ import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
-import ProjectData.Files.DBProjectFile;
 import ProjectData.LanguageName;
 import ProjectData.Messages.Errors.MessageError;
 import ProjectData.Project.db_project_info;
@@ -313,6 +312,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
         }
         project.CreateVisualiserData();
         //---
+        /*
         if (isTransformation && !messages.isEmpty()) {
             project.Open(); //нельзя!!! сначала надо определиться с версиями. И только потом, получать файлы.
             //а так же, убрать dep и txt
@@ -328,6 +328,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
             project.db.Commit();
             project.db.Disconnect();
         }
+         */
     }
     //-------------------------------------------------->>
     @Override
diff --git a/src/TestingSystem/TestingServer.java b/src/TestingSystem/TestingServer.java
index 43b9a846..916d0ed2 100644
--- a/src/TestingSystem/TestingServer.java
+++ b/src/TestingSystem/TestingServer.java
@@ -214,10 +214,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     }
     protected TestingPlanner testingPlanner = new TestingPlanner();
     protected Thread testingThread = new Thread(() -> testingPlanner.Perform());
-    /*
-    protected ServerSapforTestingPlanner sapforTestingPlanner = new ServerSapforTestingPlanner();
-    protected Thread sapforTestingThread = new Thread(() -> sapforTestingPlanner.Perform());
-     */
     //------>>>
     public static boolean checkTasks = false;
     //--
diff --git a/src/Visual_DVM_2021/Passes/All/CheckAccount.java b/src/Visual_DVM_2021/Passes/All/CheckAccount.java
index 270ec04b..0cd1d926 100644
--- a/src/Visual_DVM_2021/Passes/All/CheckAccount.java
+++ b/src/Visual_DVM_2021/Passes/All/CheckAccount.java
@@ -29,5 +29,6 @@ public class CheckAccount extends Pass_2021 {
         }
         if (Current.getAccount().isAdmin())
             Pass_2021.passes.get(PassCode_2021.PublishComponent).setControlsVisible(true);
+        setControlsVisible(false); //если проверка успешна, кнопку больше не показывать.
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/Precompilation.java b/src/Visual_DVM_2021/Passes/All/Precompilation.java
index e36f8b1b..2da5263d 100644
--- a/src/Visual_DVM_2021/Passes/All/Precompilation.java
+++ b/src/Visual_DVM_2021/Passes/All/Precompilation.java
@@ -11,7 +11,6 @@ import GlobalData.Module.Module;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.LanguageName;
-import ProjectData.Messages.Message;
 import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;
@@ -157,7 +156,7 @@ public class Precompilation extends Pass_2021<db_project_info> {
                     messageType = 2;
                 }
                 if (messageType != Constants.Nan) {
-                    target.db.files.Data.get(messageFile).CreateAndAddNewMessage(messageType, String.join("\n", messageText), messageLine, Message.parser_group);
+                    target.db.files.Data.get(messageFile).CreateAndAddNewMessage(messageType, String.join("\n", messageText), messageLine, Constants.compiler_group);
                     messageStarted = false;
                 } else {
                     if (!S.isEmpty())
diff --git a/src/Visual_DVM_2021/UI/Main/CallbackForm.java b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
index c72c3b20..9583749f 100644
--- a/src/Visual_DVM_2021/UI/Main/CallbackForm.java
+++ b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
@@ -163,7 +163,9 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         Global.componentsServer.db.bugReports.mountUI(bugReportsPanel);
         Global.componentsServer.db.subscribers.mountUI(subscribersPanel);
         settingsTools.add(Pass_2021.passes.get(PassCode_2021.ApplyBugReportSettings).createButton());
-        // accountTools.add(Pass_2021.passes.get(PassCode_2021.CheckAccount).createButton());
+        //-
+        if (!Pass_2021.passes.get(PassCode_2021.CheckAccount).isDone())
+            accountTools.add(Pass_2021.passes.get(PassCode_2021.CheckAccount).createButton());
         //--
         BugReportsKeyFilter.getDocument().addDocumentListener(new DocumentListener() {
             @Override