From 953ff522d57b97be802be085954a0bdde45ddbed Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 11 Dec 2023 18:52:23 +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=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=82=D0=B5=D0=BA=D1=83=D1=89?=
 =?UTF-8?q?=D0=B5=D0=B9=20=D0=B4=D0=B2=D0=BC=20=D1=81=D0=B8=D1=81=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BC=D1=8B=20=D0=BD=D0=B0=20=D0=B2=D0=BA=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                              | 16 ++--------------
 .../UI/Menus_2023/MainMenuBar/MainWindow.java    |  1 -
 src/GlobalData/Compiler/CompilersDBTable.java    |  4 ++--
 src/GlobalData/Machine/MachinesDBTable.java      |  4 ++--
 src/GlobalData/User/UsersDBTable.java            |  4 ++--
 .../UI/Interface/TestingWindow.java              |  1 +
 src/Visual_DVM_2021/UI/Main/MainForm.java        |  8 ++++----
 src/Visual_DVM_2021/UI/Main/TestingForm.java     |  7 +++++++
 8 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6425fd09..239914cb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,25 +7,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/icons/Kernels.png" 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/Common/UI/Menus_2023/MenuBarButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MenuBarButton.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/Common/UI/Menus_2023/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VisualiserMenuBar.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/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.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/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageState.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/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/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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java b/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
index 9c0e9bb4..3be50d89 100644
--- a/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
+++ b/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
@@ -17,7 +17,6 @@ public interface MainWindow {
     void FocusTesting();
     void SwitchTestingTabs(boolean flag);
     //-
-    void ShowCredentials();
     void ShowCheckedTestsCount();
     void FocusCredentials();
 }
diff --git a/src/GlobalData/Compiler/CompilersDBTable.java b/src/GlobalData/Compiler/CompilersDBTable.java
index db2e70ea..72d73f1b 100644
--- a/src/GlobalData/Compiler/CompilersDBTable.java
+++ b/src/GlobalData/Compiler/CompilersDBTable.java
@@ -119,12 +119,12 @@ public class CompilersDBTable extends iDBTable<Compiler> {
             @Override
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
-                UI.getMainWindow().ShowCredentials();
+                UI.getMainWindow().getTestingWindow().ShowCurrentCompiler();
             }
             @Override
             public void ShowNoCurrentObject() throws Exception {
                 super.ShowNoCurrentObject();
-                UI.getMainWindow().ShowCredentials();
+                UI.getMainWindow().getTestingWindow().ShowCurrentCompiler();
             }
         };
     }
diff --git a/src/GlobalData/Machine/MachinesDBTable.java b/src/GlobalData/Machine/MachinesDBTable.java
index 2e16a07c..c0dac0cf 100644
--- a/src/GlobalData/Machine/MachinesDBTable.java
+++ b/src/GlobalData/Machine/MachinesDBTable.java
@@ -83,13 +83,13 @@ public class MachinesDBTable extends iDBTable<Machine> {
             @Override
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
-                UI.getMainWindow().ShowCredentials();
+                UI.getMainWindow().getTestingWindow().ShowCurrentCompiler();
                 UI.testingBar.ShowMachine();
             }
             @Override
             public void ShowNoCurrentObject() throws Exception {
                 super.ShowNoCurrentObject();
-                UI.getMainWindow().ShowCredentials();
+                UI.getMainWindow().getTestingWindow().ShowCurrentCompiler();
                 UI.testingBar.ShowNoMachine();
             }
             @Override
diff --git a/src/GlobalData/User/UsersDBTable.java b/src/GlobalData/User/UsersDBTable.java
index 0c234012..ab008e30 100644
--- a/src/GlobalData/User/UsersDBTable.java
+++ b/src/GlobalData/User/UsersDBTable.java
@@ -76,13 +76,13 @@ public class UsersDBTable extends iDBTable<User> {
             @Override
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
-                UI.getMainWindow().ShowCredentials();
+              //  UI.getMainWindow().ShowCurrentCompiler();
                 UI.testingBar.ShowUser();
             }
             @Override
             public void ShowNoCurrentObject() throws Exception {
                 super.ShowNoCurrentObject();
-                UI.getMainWindow().ShowCredentials();
+             //   UI.getMainWindow().ShowCurrentCompiler();
                 UI.testingBar.ShowNoUser();
             }
 
diff --git a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
index 7fcfcaa9..8b07e20d 100644
--- a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
+++ b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
@@ -17,4 +17,5 @@ public interface TestingWindow extends VisualizerForm {
     void ShowNoSapforPackageVersionEtalon();
     void ShowNoSapforPackageVersion();
     void FocusSapforTesting();
+    void ShowCurrentCompiler();
 }
diff --git a/src/Visual_DVM_2021/UI/Main/MainForm.java b/src/Visual_DVM_2021/UI/Main/MainForm.java
index 6dcf10b4..31cfef54 100644
--- a/src/Visual_DVM_2021/UI/Main/MainForm.java
+++ b/src/Visual_DVM_2021/UI/Main/MainForm.java
@@ -6,6 +6,7 @@ import Common.UI.UI;
 import Common.UI.Windows.Form;
 import Common.UI.Windows.FormType;
 import Common.Utils.Utils;
+import GlobalData.Compiler.CompilerType;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -144,9 +145,8 @@ public class MainForm extends Form implements MainWindow {
                 testingForm.getContent(),
                 "Система тестирования", 4);
     }
-    @Override
-    public void ShowCredentials() {
-        /*
+  /*
+    public void ShowCurrentCompiler() {
         String res = "";
         if (Current.HasMachine()) {
             res += "@" + Current.getMachine().getURL();
@@ -163,8 +163,8 @@ public class MainForm extends Form implements MainWindow {
             res += "?@?";
         }
         globalTabs.setTitleAt(2, res);
-        */
     }
+    */
     @Override
     public void ShowCheckedTestsCount() {
         int res = 0;
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index 0076cdfa..774836d6 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -3,6 +3,7 @@ import Common.Current;
 import Common.Global;
 import Common.UI.TextField.StyledTextField;
 import Common.UI.UI;
+import GlobalData.Compiler.CompilerType;
 import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.UI.Interface.FormWithSplitters;
 import Visual_DVM_2021.UI.Interface.TestingWindow;
@@ -181,4 +182,10 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     public void FocusSapforTesting() {
         testingTabs.setSelectedIndex(1);
     }
+    @Override
+    public void ShowCurrentCompiler() {
+        String title = (Current.HasCompiler() && Current.getCompiler().type.equals(CompilerType.dvm))?
+                "DVM система: " + Current.getCompiler().description: "DVM система: ?";
+        testingTabs.setTitleAt(0, title);
+    }
 }