From 1f6cc4a579e7ce61fb40570e2e44c4900d4f343e Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 14 Oct 2024 21:55:58 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 43 ++++++----------
 src/Common/Visual/Menus/DataMenuBar.java      |  2 -
 src/Common/Visual/UIModule_.java              | 47 +++++++++++++++++
 src/Common/Visual/UI_.java                    | 18 ++-----
 src/Common/Visual/Windows/Dialog/Dialog.java  |  4 +-
 src/_VisualDVM/Global.java                    |  1 -
 .../GlobalData/Machine/MachinesDBTable.java   |  5 +-
 .../GlobalData/User/UsersDBTable.java         |  4 +-
 .../Passes/All/ConvertCorrectnessTests.java   |  3 +-
 .../{TestingBar.java => TestingMenuBar.java}  |  4 +-
 src/_VisualDVM/Visual/MainUI.java             | 23 +++++++++
 ...ntialsBar.java => CredentialsMenuBar.java} |  4 +-
 src/_VisualDVM/Visual/UI.java                 | 50 ++-----------------
 .../Visual/Windows/CallbackForm.java          |  6 +--
 src/_VisualDVM/Visual/Windows/FileForm.java   | 17 ++++---
 src/_VisualDVM/Visual/Windows/MainForm.java   | 14 +++---
 .../Visual/Windows/TestingForm.java           |  4 +-
 .../Visual/Windows/VersionsForm.java          |  4 +-
 18 files changed, 129 insertions(+), 124 deletions(-)
 rename src/_VisualDVM/TestingSystem/Common/{TestingBar.java => TestingMenuBar.java} (97%)
 rename src/_VisualDVM/Visual/Menus/CredentialsBar/{CredentialsBar.java => CredentialsMenuBar.java} (95%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 50bf6eee..c6c2ba89 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,38 +8,23 @@
   <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/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/DataMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/DataMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/UI_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UI_.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Visual/Menus/DataMenuBar.java b/src/Common/Visual/Menus/DataMenuBar.java
index e7441113..1eb6439d 100644
--- a/src/Common/Visual/Menus/DataMenuBar.java
+++ b/src/Common/Visual/Menus/DataMenuBar.java
@@ -15,8 +15,6 @@ public class DataMenuBar extends VisualiserMenuBar {
     JButton unselectAllButton = null;
     //-
     public DataMenuBar(String dataName, PassCode... passes) {
-        System.out.println("create bar for "+dataName);
-        //  Font font = Current.getTheme().Fonts.get(VisualiserFonts.TreeBoldItalic).deriveFont(12.0F);
         add(new JLabel(dataName + " : "));
         add(countLabel = new JLabel("?"));
         addPasses(passes);
diff --git a/src/Common/Visual/UIModule_.java b/src/Common/Visual/UIModule_.java
index 0b17de10..3e3eac0b 100644
--- a/src/Common/Visual/UIModule_.java
+++ b/src/Common/Visual/UIModule_.java
@@ -6,7 +6,10 @@ import Common.Visual.Themes.VisualiserTheme;
 import Common.Visual.Windows.PassForm;
 import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar;
 
+import javax.swing.*;
+import java.awt.*;
 import java.util.LinkedHashMap;
+import java.util.Stack;
 public class UIModule_ {
     //--
     VisualiserTheme theme = new DefaultTheme();
@@ -30,4 +33,48 @@ public class UIModule_ {
     public FastAccessMenuBar getFastAccessMenuBar(){return fastAccessMenuBar;}
     //-
     public LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
+    //--
+    public Stack<Component> windowsStack = new Stack<>();
+    public Component getFrontWindow() {
+        Component res = null;
+        try {
+            res = windowsStack.peek();
+        } catch (Exception ignored) {
+        }
+        return res;
+    }
+    public UIModule_(){
+        //<editor-fold desc="Локализация компонентов окна JFileChooser">
+        UIManager.put("FileChooser.openButtonText", "Открыть");
+        UIManager.put("FileChooser.cancelButtonText", "Отмена");
+        UIManager.put("FileChooser.lookInLabelText", "Смотреть в");
+        UIManager.put("FileChooser.fileNameLabelText", "Имя файла");
+        UIManager.put("FileChooser.filesOfTypeLabelText", "Тип файла");
+        UIManager.put("FileChooser.saveButtonText", "Сохранить");
+        UIManager.put("FileChooser.saveButtonToolTipText", "Сохранить");
+        UIManager.put("FileChooser.openButtonToolTipText", "Открыть");
+        UIManager.put("FileChooser.cancelButtonText", "Отмена");
+        UIManager.put("FileChooser.cancelButtonToolTipText", "Отмена");
+        UIManager.put("FileChooser.lookInLabelText", "Папка");
+        UIManager.put("FileChooser.saveInLabelText", "Папка");
+        UIManager.put("FileChooser.fileNameLabelText", "Имя файла");
+        UIManager.put("FileChooser.filesOfTypeLabelText", "Тип файлов");
+        UIManager.put("FileChooser.upFolderToolTipText", "На один уровень вверх");
+        UIManager.put("FileChooser.newFolderToolTipText", "Создание новой папки");
+        UIManager.put("FileChooser.listViewButtonToolTipText", "Список");
+        UIManager.put("FileChooser.detailsViewButtonToolTipText", "Таблица");
+        UIManager.put("FileChooser.fileNameHeaderText", "Имя");
+        UIManager.put("FileChooser.fileSizeHeaderText", "Размер");
+        UIManager.put("FileChooser.fileTypeHeaderText", "Тип");
+        UIManager.put("FileChooser.fileDateHeaderText", "Изменен");
+        UIManager.put("FileChooser.fileAttrHeaderText", "Атрибуты");
+        UIManager.put("FileChooser.acceptAllFileFilterText", "Все файлы");
+        //</editor-fold>
+        //<editor-fold desc="Локализация компонентов окна подтверждения">
+        UIManager.put("OptionPane.yesButtonText", "Да");
+        UIManager.put("OptionPane.noButtonText", "Нет");
+        UIManager.put("OptionPane.cancelButtonText", "Отмена");
+        UIManager.put("OptionPane.okButtonText", "Готово");
+        //</editor-fold>
+    }
 }
diff --git a/src/Common/Visual/UI_.java b/src/Common/Visual/UI_.java
index 7d471106..a2212a42 100644
--- a/src/Common/Visual/UI_.java
+++ b/src/Common/Visual/UI_.java
@@ -1,4 +1,5 @@
 package Common.Visual;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 
 import javax.swing.*;
@@ -9,18 +10,9 @@ import java.util.Stack;
 public class UI_ {
     public static boolean active = false; //есть ли интерфейс. в консольных версиях не нужен.
     //---
-    public static Stack<Component> windowsStack = new Stack<>();
     public static boolean isActive() {
         return active;
     }
-    public static Component getFrontWindow() {
-        Component res = null;
-        try {
-            res = windowsStack.peek();
-        } catch (Exception ignored) {
-        }
-        return res;
-    }
     //-----
     public static void Clear(Container container) {
         container.removeAll();
@@ -67,21 +59,21 @@ public class UI_ {
                 JOptionPane.QUESTION_MESSAGE) == 0);
     }
     public static boolean Question(String text) {
-        return Question(getFrontWindow(), text);
+        return Question(MainModule_.instance.getUI().getFrontWindow(), text);
     }
     public static void Info(String message) {
         Utils_.CopyToClipboard(message);
         if (UI_.isActive())
-            JOptionPane.showMessageDialog(getFrontWindow(), message, "", 1);
+            JOptionPane.showMessageDialog(MainModule_.instance.getUI().getFrontWindow(), message, "", 1);
     }
     public static void Error(String message) {
         Utils_.CopyToClipboard(message);
         if (UI_.isActive())
-            JOptionPane.showMessageDialog(getFrontWindow(), message, "", 0);
+            JOptionPane.showMessageDialog(MainModule_.instance.getUI().getFrontWindow(), message, "", 0);
     }
     public static boolean Warning(String text) {
         return !UI_.isActive() ||
-                JOptionPane.showConfirmDialog(getFrontWindow(),
+                JOptionPane.showConfirmDialog(MainModule_.instance.getUI().getFrontWindow(),
                         text + "\nВы уверены?",
                         "Подтверждение",
                         JOptionPane.YES_NO_OPTION,
diff --git a/src/Common/Visual/Windows/Dialog/Dialog.java b/src/Common/Visual/Windows/Dialog/Dialog.java
index 5972ca8c..46c795c4 100644
--- a/src/Common/Visual/Windows/Dialog/Dialog.java
+++ b/src/Common/Visual/Windows/Dialog/Dialog.java
@@ -49,7 +49,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         addWindowListener(new WindowAdapter() {
             public void windowClosing(WindowEvent e) {
-                UI_.windowsStack.pop();
+                MainModule_.instance.getUI().windowsStack.pop();
                 onCancel();
                 onClose();
             }
@@ -117,7 +117,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
         Init(params);
         ShowTitle();
         setAlwaysOnTop(isOnTop());
-        UI_.windowsStack.push(this);
+        MainModule_.instance.getUI().windowsStack.push(this);
         setVisible(true);
         return OK;
     }
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index 81d86be4..f9d4a9c3 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -299,7 +299,6 @@ public class Global {
         if (mainModule.getDb().settings.get(SettingName.AutoTestsLoad).toBoolean())
             Global.mainModule.getPass(PassCode.SynchronizeTests).Do();
         Global.mainModule.getSapfor().refreshPid(); //без сапфора сюда это все равно не дойдет.
-        UI.CreateMenus();
         UI.CreateWindows();
     }
     public static void ServerMode() throws Exception {
diff --git a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
index 3e97c8b8..626572a5 100644
--- a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
@@ -8,6 +8,7 @@ import Common.Visual.DataSetControlForm;
 import Common.Visual.UI_;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
+import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
 import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
@@ -88,13 +89,13 @@ public class MachinesDBTable extends iDBTable<Machine> {
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
                 UI.getMainWindow().getTestingWindow().ShowCurrentCompiler();
-                UI.credentialsBar.ShowMachine();
+                Global.mainModule.getUI().getCredentialsMenuBar().ShowMachine();
             }
             @Override
             public void ShowNoCurrentObject() throws Exception {
                 super.ShowNoCurrentObject();
                 UI.getMainWindow().getTestingWindow().ShowCurrentCompiler();
-                UI.credentialsBar.ShowNoMachine();
+                Global.mainModule.getUI().getCredentialsMenuBar().ShowNoMachine();
             }
             @Override
             protected void AdditionalInitColumns() {
diff --git a/src/_VisualDVM/GlobalData/User/UsersDBTable.java b/src/_VisualDVM/GlobalData/User/UsersDBTable.java
index dd49b9e0..f09760df 100644
--- a/src/_VisualDVM/GlobalData/User/UsersDBTable.java
+++ b/src/_VisualDVM/GlobalData/User/UsersDBTable.java
@@ -82,13 +82,13 @@ public class UsersDBTable extends iDBTable<User> {
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
                 //  UI.getMainWindow().ShowCurrentCompiler();
-                UI.credentialsBar.ShowUser();
+                Global.mainModule.getUI().getCredentialsMenuBar().ShowUser();
             }
             @Override
             public void ShowNoCurrentObject() throws Exception {
                 super.ShowNoCurrentObject();
                 //   UI.getMainWindow().ShowCurrentCompiler();
-                UI.credentialsBar.ShowNoUser();
+                Global.mainModule.getUI().getCredentialsMenuBar().ShowNoUser();
             }
         };
     }
diff --git a/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java b/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
index c638bf67..c6ae483e 100644
--- a/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
+++ b/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
@@ -6,7 +6,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.TestingSystemPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
-import _VisualDVM.Visual.UI;
 
 import java.io.File;
 public class ConvertCorrectnessTests extends TestingSystemPass<File> {
@@ -45,7 +44,7 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
     }
     @Override
     protected void showPreparation() throws Exception {
-        UI.testingBar.ShowAutoCheckTesting();
+        Global.mainModule.getUI().getTestingMenuBar().ShowAutoCheckTesting();
     }
     @Override
     protected void ServerAction() throws Exception {
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingBar.java b/src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java
similarity index 97%
rename from src/_VisualDVM/TestingSystem/Common/TestingBar.java
rename to src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java
index 0a5a4b18..ab7f1d2b 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingBar.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java
@@ -10,13 +10,13 @@ import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
 import java.awt.*;
-public class TestingBar extends VisualiserMenuBar {
+public class TestingMenuBar extends VisualiserMenuBar {
     //  public JLabel KernelsLabel;
     public JButton autorefreshButton;
     JSpinner sCheckTime;
     // JSpinner sKernels;
     JLabel serverAdminLabel;
-    public TestingBar() {
+    public TestingMenuBar() {
         //-
         //   KernelsLabel = addLabel("", "/icons/Kernels.png");
         //   KernelsLabel.setHorizontalTextPosition(JLabel.LEFT);
diff --git a/src/_VisualDVM/Visual/MainUI.java b/src/_VisualDVM/Visual/MainUI.java
index 66a52768..e112566e 100644
--- a/src/_VisualDVM/Visual/MainUI.java
+++ b/src/_VisualDVM/Visual/MainUI.java
@@ -1,7 +1,30 @@
 package _VisualDVM.Visual;
 import Common.Visual.UIModule_;
+import _VisualDVM.TestingSystem.Common.TestingMenuBar;
+import _VisualDVM.Visual.Menus.CredentialsBar.CredentialsMenuBar;
+import _VisualDVM.Visual.Menus.FileMenuBar.FileMenuBar;
+import _VisualDVM.Visual.Menus.MainMenuBar.MainMenuBar;
+import _VisualDVM.Visual.Menus.VersionsMenuBar.VersionsMenuBar;
 import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
 public class MainUI extends UIModule_ {
+    TestingMenuBar testingMenuBar = null;
+    CredentialsMenuBar credentialsMenuBar = null;
+    VersionsMenuBar versionsMenuBar = null;
+    public TestingMenuBar getTestingMenuBar(){
+        if (testingMenuBar ==null)
+            testingMenuBar = new TestingMenuBar();
+        return testingMenuBar;
+    }
+    public VersionsMenuBar getVersionsMenuBar(){
+        if (versionsMenuBar ==null)
+            versionsMenuBar = new VersionsMenuBar();
+        return versionsMenuBar;
+    }
+    public CredentialsMenuBar getCredentialsMenuBar(){
+        if (credentialsMenuBar==null)
+            credentialsMenuBar= new CredentialsMenuBar();
+        return credentialsMenuBar;
+    }
     public MainUI(){
         setTheme(new LightSPFEditorTheme());
     }
diff --git a/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java b/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsMenuBar.java
similarity index 95%
rename from src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java
rename to src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsMenuBar.java
index 10ff1d38..ad3257c2 100644
--- a/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java
+++ b/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsMenuBar.java
@@ -7,11 +7,11 @@ import _VisualDVM.Passes.PassCode;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-public class CredentialsBar extends VisualiserMenuBar {
+public class CredentialsMenuBar extends VisualiserMenuBar {
     public MenuBarButton MachineButton;
     public MenuBarButton UserButton;
     MenuBarButton bExpand;
-    public CredentialsBar() {
+    public CredentialsMenuBar() {
         this.add(bExpand = new MenuBarButton() {
             {
                 setIcon("/icons/ExpandDown.png");
diff --git a/src/_VisualDVM/Visual/UI.java b/src/_VisualDVM/Visual/UI.java
index 9bba523b..997b2ffa 100644
--- a/src/_VisualDVM/Visual/UI.java
+++ b/src/_VisualDVM/Visual/UI.java
@@ -18,12 +18,11 @@ import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionStateChanger;
 import _VisualDVM.ProjectData.SapforData.Arrays.UI.RulesTreeCellRenderer;
 import _VisualDVM.ProjectData.SapforData.Variants.UI.VariantRankRenderer;
 import _VisualDVM.Repository.Component.UI.ComponentsForm;
-import _VisualDVM.TestingSystem.Common.TestingBar;
+import _VisualDVM.TestingSystem.Common.TestingMenuBar;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
 import _VisualDVM.Visual.Interface.DebugWindow;
 import _VisualDVM.Visual.Interface.VersionsWindow;
-import _VisualDVM.Visual.Menus.CredentialsBar.CredentialsBar;
-import _VisualDVM.Visual.Menus.FileMenuBar.FileMenuBar;
+import _VisualDVM.Visual.Menus.CredentialsBar.CredentialsMenuBar;
 import _VisualDVM.Visual.Menus.MainMenuBar.MainMenuBar;
 import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
 import _VisualDVM.Visual.Menus.VersionsMenuBar.VersionsMenuBar;
@@ -45,11 +44,7 @@ public class UI {
     //------------
     public static final Highlighter.HighlightPainter GoodLoopPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(152, 251, 152, 90));
     public static final Highlighter.HighlightPainter BadLoopPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(240, 128, 128, 90));
-    public static MainMenuBar mainMenuBar = null;
-    public static TestingBar testingBar = null;
-    public static CredentialsBar credentialsBar = null;
-    public static FileMenuBar fileMenuBar = null;
-    public static VersionsMenuBar versionsMenuBar = null;
+
     public static LinkedHashMap<Common.Visual.Tables.TableRenderers, TableCellRenderer> TableRenderers = new LinkedHashMap<>();
     public static LinkedHashMap<Common.Visual.Tables.TableEditors, TableCellEditor> TableEditors = new LinkedHashMap<>();
     public static LinkedHashMap<Common.Visual.Trees.TreeRenderers, TreeCellRenderer> TreeRenderers = new LinkedHashMap<>();
@@ -64,12 +59,6 @@ public class UI {
     public static boolean HasMainWindow() {
         return mainWindow != null;
     }
-    public static void CreateMenus() {
-        mainMenuBar = new MainMenuBar();
-        testingBar = new TestingBar();
-        credentialsBar = new CredentialsBar();
-        versionsMenuBar = new VersionsMenuBar();
-    }
     public static void CreateWindows() {
         searchReplaceWindow = new SearchReplaceForm();
         remoteFileChooser = new RemoteFileChooser();
@@ -80,39 +69,6 @@ public class UI {
     }
     //-
     public static void CreateAll() {
-        //<editor-fold desc="Локализация компонентов окна JFileChooser">
-        UIManager.put("FileChooser.openButtonText", "Открыть");
-        UIManager.put("FileChooser.cancelButtonText", "Отмена");
-        UIManager.put("FileChooser.lookInLabelText", "Смотреть в");
-        UIManager.put("FileChooser.fileNameLabelText", "Имя файла");
-        UIManager.put("FileChooser.filesOfTypeLabelText", "Тип файла");
-        UIManager.put("FileChooser.saveButtonText", "Сохранить");
-        UIManager.put("FileChooser.saveButtonToolTipText", "Сохранить");
-        UIManager.put("FileChooser.openButtonToolTipText", "Открыть");
-        UIManager.put("FileChooser.cancelButtonText", "Отмена");
-        UIManager.put("FileChooser.cancelButtonToolTipText", "Отмена");
-        UIManager.put("FileChooser.lookInLabelText", "Папка");
-        UIManager.put("FileChooser.saveInLabelText", "Папка");
-        UIManager.put("FileChooser.fileNameLabelText", "Имя файла");
-        UIManager.put("FileChooser.filesOfTypeLabelText", "Тип файлов");
-        UIManager.put("FileChooser.upFolderToolTipText", "На один уровень вверх");
-        UIManager.put("FileChooser.newFolderToolTipText", "Создание новой папки");
-        UIManager.put("FileChooser.listViewButtonToolTipText", "Список");
-        UIManager.put("FileChooser.detailsViewButtonToolTipText", "Таблица");
-        UIManager.put("FileChooser.fileNameHeaderText", "Имя");
-        UIManager.put("FileChooser.fileSizeHeaderText", "Размер");
-        UIManager.put("FileChooser.fileTypeHeaderText", "Тип");
-        UIManager.put("FileChooser.fileDateHeaderText", "Изменен");
-        UIManager.put("FileChooser.fileAttrHeaderText", "Атрибуты");
-        UIManager.put("FileChooser.acceptAllFileFilterText", "Все файлы");
-        //</editor-fold>
-        //<editor-fold desc="Локализация компонентов окна подтверждения">
-        UIManager.put("OptionPane.yesButtonText", "Да");
-        UIManager.put("OptionPane.noButtonText", "Нет");
-        UIManager.put("OptionPane.cancelButtonText", "Отмена");
-        UIManager.put("OptionPane.okButtonText", "Готово");
-        //</editor-fold>
-        //</editor-fold>
         //<editor-fold desc="Объекты отрисовки и редактирования деревьев и таблиц">
         TableRenderers.put(RendererDate, new DateRenderer_());
         TableRenderers.put(RendererProgress, new ProgressBarRenderer());
diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.java b/src/_VisualDVM/Visual/Windows/CallbackForm.java
index 4ab4fa10..adc146eb 100644
--- a/src/_VisualDVM/Visual/Windows/CallbackForm.java
+++ b/src/_VisualDVM/Visual/Windows/CallbackForm.java
@@ -372,13 +372,13 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
     public void setUserRights() {
         LockMyOnly();
         Global.mainModule.SetUserPassesAccess();
-        UI.testingBar.showServerAdminLabel(false);
+        Global.mainModule.getUI().getTestingMenuBar().showServerAdminLabel(false);
         adminLabel.setVisible(false);
     }
     private void setDeveloperRights() {
         UnlockMyOnly();
         Global.mainModule.SetDeveloperPassesAccess();
-        UI.testingBar.showServerAdminLabel(false);
+        Global.mainModule.getUI().getTestingMenuBar().showServerAdminLabel(false);
         adminLabel.setVisible(false);
     }
     @Override
@@ -386,7 +386,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         UnlockMyOnly();
         Global.mainModule.SetAdminPassesAccess();
         //--
-        UI.testingBar.showServerAdminLabel(true);
+        Global.mainModule.getUI().getTestingMenuBar().showServerAdminLabel(true);
         adminLabel.setVisible(true);
     }
     @Override
diff --git a/src/_VisualDVM/Visual/Windows/FileForm.java b/src/_VisualDVM/Visual/Windows/FileForm.java
index adc74333..ed0d1a79 100644
--- a/src/_VisualDVM/Visual/Windows/FileForm.java
+++ b/src/_VisualDVM/Visual/Windows/FileForm.java
@@ -67,6 +67,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
     private TreeForm arraysForm;
     //-
     private SPFEditor Body = null; //времянка? не очень красиво.
+    FileMenuBar fileMenuBar= null;
     //-
     public FileForm(DBProjectFile file_in) {
         LoadSplitters();
@@ -90,11 +91,11 @@ public class FileForm implements FileWindow, FormWithSplitters {
         ShowGCOVLog();
         ShowAllAnalyses();
         Body.addCaretListener(ce -> ShowCaretInfo());
-        editorPanel.add(UI.fileMenuBar = new FileMenuBar(Body), BorderLayout.NORTH);
+        editorPanel.add(fileMenuBar = new FileMenuBar(Body), BorderLayout.NORTH);
         ShowCaretInfo();
         Body.requestFocus();
         RefreshTabsNames();
-        UI.fileMenuBar.sToGo.addChangeListener(e -> Body.gotoLine((Integer) UI.fileMenuBar.sToGo.getValue()));
+        fileMenuBar.sToGo.addChangeListener(e -> Body.gotoLine((Integer) fileMenuBar.sToGo.getValue()));
         ShowProperties();
         Global.mainModule.getPass(PassCode.Save).setControlsEnabled(false);
         //-
@@ -122,11 +123,11 @@ public class FileForm implements FileWindow, FormWithSplitters {
             Body.setSyntaxEditingStyle(file.languageName.getStyleKey());
         Body.setCodeFoldingEnabled(true);
         Body.switching_language = false;
-        UI.fileMenuBar.ShowLanguage();
+        fileMenuBar.ShowLanguage();
     }
     @Override
     public void ShowType() {
-        UI.fileMenuBar.ShowType();
+        fileMenuBar.ShowType();
     }
     @Override
     public void ShowStyle() {
@@ -149,7 +150,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
             }
         }
         Body.switching_language = false;
-        UI.fileMenuBar.ShowStyle();
+        fileMenuBar.ShowStyle();
     }
     @Override
     public SPFEditorInterface getEditor() {
@@ -299,12 +300,12 @@ public class FileForm implements FileWindow, FormWithSplitters {
         int new_current_line = Body.getCurrentLine();
         boolean line_changed = (new_current_line != current_file_line);
         current_file_line = new_current_line;
-        UI.fileMenuBar.sToGo.setModel(new SpinnerNumberModel(current_file_line,
+        fileMenuBar.sToGo.setModel(new SpinnerNumberModel(current_file_line,
                 1, Body.getLineCount(), 1
         ));
         //-
-        UI.fileMenuBar.ShowLinesCount();
-        UI.fileMenuBar.CurrentSymbolLabel.setText(String.valueOf(Body.getCurrentSymbol()));
+        fileMenuBar.ShowLinesCount();
+        fileMenuBar.CurrentSymbolLabel.setText(String.valueOf(Body.getCurrentSymbol()));
         //если выделяем строку из графа, то тоже надо отключиьт события.
         //чтобы по ней не начался поиск.
         if (events_on && line_changed) {
diff --git a/src/_VisualDVM/Visual/Windows/MainForm.java b/src/_VisualDVM/Visual/Windows/MainForm.java
index 00432f98..3d049a73 100644
--- a/src/_VisualDVM/Visual/Windows/MainForm.java
+++ b/src/_VisualDVM/Visual/Windows/MainForm.java
@@ -1,13 +1,14 @@
 package _VisualDVM.Visual.Windows;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Controls.TabToolBar;
-import Common.Visual.UI_;
 import Common.Visual.Windows.Form;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.Visual.Interface.*;
+import _VisualDVM.Visual.Menus.MainMenuBar.MainMenuBar;
 import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
 import _VisualDVM.Visual.UI;
 
@@ -27,8 +28,9 @@ public class MainForm extends Form implements MainWindow {
     private JPanel Content;
     private JTabbedPane globalTabs;
     private JPanel mainPanel;
+    MainMenuBar mainMenuBar;
     public MainForm() {
-        mainPanel.add(UI.mainMenuBar, BorderLayout.NORTH);
+        mainPanel.add( mainMenuBar = new MainMenuBar(), BorderLayout.NORTH);
         InstallWelcomePanel();
         InstallCallbackPanel();
         InstallTestsPanel();
@@ -197,7 +199,7 @@ public class MainForm extends Form implements MainWindow {
     }
     @Override
     public void ShowUpdatesIcon() {
-        UI.mainMenuBar.ShowUpdatesIcon();
+        mainMenuBar.ShowUpdatesIcon();
     }
     @Override
     public void FocusProject() {
@@ -233,7 +235,7 @@ public class MainForm extends Form implements MainWindow {
         getTestsWindow().ShowAll();
         if (getTestingWindow() != null)
             getTestingWindow().ShowAll();
-        UI_.windowsStack.push(this);
+        MainModule_.instance.getUI().windowsStack.push(this);
         super.Show();
     }
     @Override
@@ -244,7 +246,7 @@ public class MainForm extends Form implements MainWindow {
         InstallProjectPanel();
         restoreGlobalTab();
         UI.getDebugWindow().DropCompilationTasksComparison();
-        UI.mainMenuBar.ShowProject(true);
+        mainMenuBar.ShowProject(true);
     }
     @Override
     public void ShowNoProject() {
@@ -253,6 +255,6 @@ public class MainForm extends Form implements MainWindow {
         RemoveProjectPanel();
         InstallWelcomePanel();
         restoreGlobalTab();
-        UI.mainMenuBar.ShowProject(false);
+        mainMenuBar.ShowProject(false);
     }
 }
diff --git a/src/_VisualDVM/Visual/Windows/TestingForm.java b/src/_VisualDVM/Visual/Windows/TestingForm.java
index 6ddca2cf..254634a4 100644
--- a/src/_VisualDVM/Visual/Windows/TestingForm.java
+++ b/src/_VisualDVM/Visual/Windows/TestingForm.java
@@ -97,7 +97,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     };
     //--
     public TestingForm() {
-        content.add(UI.testingBar, BorderLayout.NORTH);
+        content.add(Global.mainModule.getUI().getTestingMenuBar(), BorderLayout.NORTH);
         LoadSplitters();
         //-
         dvmTestingRunMaster = new DVMRunTasksComparisonForm(dvmTestingRunSlave = new DVMRunTasksComparisonForm(null));
@@ -313,7 +313,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     public void CollapseCredentials() {
         Global.mainModule.getDb().splitters.get("SC71").position = SC71.getDividerLocation();
         UI_.Clear(credentialsPanel);
-        credentialsPanel.add(UI.credentialsBar);
+        credentialsPanel.add(Global.mainModule.getUI().getCredentialsMenuBar());
         SC71.setDividerLocation(30);
         SC71.setDividerSize(0);
         credentialsPanel.revalidate();
diff --git a/src/_VisualDVM/Visual/Windows/VersionsForm.java b/src/_VisualDVM/Visual/Windows/VersionsForm.java
index 7952e0c9..0be93e07 100644
--- a/src/_VisualDVM/Visual/Windows/VersionsForm.java
+++ b/src/_VisualDVM/Visual/Windows/VersionsForm.java
@@ -1,6 +1,8 @@
 package _VisualDVM.Visual.Windows;
+import Common.MainModule_;
 import Common.Visual.Trees.TreeForm;
 import Common.Visual.UI_;
+import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Project.UI.VersionsTree;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.Visual.Interface.FormWithSplitters;
@@ -34,7 +36,7 @@ public class VersionsForm implements FormWithSplitters, VersionsWindow {
         versionsTreeForm.Show();
         //-
         versionsTabs.setEnabledAt(0, false);
-        versionsPanel.add(UI.versionsMenuBar, BorderLayout.NORTH);
+        versionsPanel.add(Global.mainModule.getUI().getVersionsMenuBar(), BorderLayout.NORTH);
     }
     private void createUIComponents() {
         // TODO: place custom component creation code here