From 7f1d21a06738ccec398eee1f8f184d0a5611e977 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 14 Oct 2024 20:57:18 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=B1=D0=B0=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20=D1=82=D0=B0=D0=B1=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 77 ++++++---------
 src/Common/Database/Tables/DataSet.java       | 26 +++--
 src/Common/Passes/Pass.java                   |  2 +-
 .../Visual/Controls/HyperlinksStyledList.java |  1 -
 src/Common/Visual/Controls/MenuBarButton.java |  1 -
 .../Visual/Controls/StableMenuItem.java       |  1 -
 src/Common/Visual/Controls/StyledList.java    |  1 -
 .../Visual/Controls/StyledProgressBar.java    |  1 -
 src/Common/Visual/Controls/TabToolBar.java    |  2 +-
 src/Common/Visual/Menus/DataMenuBar.java      |  1 +
 src/Common/Visual/Menus/StyledPopupMenu.java  |  1 -
 src/Common/Visual/Menus/VisualiserMenu.java   |  8 --
 .../Visual/Menus/VisualiserMenuBar.java       |  1 -
 .../Visual/Menus/VisualiserMenuItem.java      |  1 -
 .../Visual/Tables/HiddenListRenderer.java     |  1 -
 .../Visual/Tables/StatusEnumRenderer.java     |  1 -
 src/Common/Visual/Tables/StyledCellLabel.java |  1 -
 src/Common/Visual/Tables/StyledTable.java     |  1 -
 .../Visual/Tables/WrapTextRenderer.java       |  1 -
 .../Visual/Trees/GraphTreeCellRenderer.java   |  1 -
 .../Trees/SelectionTreeCellRenderer.java      |  1 -
 src/Common/Visual/Trees/StyledTree.java       |  1 -
 .../Visual/Trees/StyledTreeCellRenderer.java  |  1 -
 src/Common/Visual/UI_.java                    |  5 -
 .../Windows/Dialog/DialogTextComboBox.java    |  1 -
 .../Visual/Windows/Dialog/DialogWrapText.java |  1 -
 .../GlobalData/Compiler/CompilersDBTable.java |  4 +
 .../UI/CompilerEnvironmentValueRenderer.java  |  1 -
 .../CompilerOptionParameterNameRenderer.java  |  1 -
 .../CompilerOptionParameterValueRenderer.java |  1 -
 .../DVMParameter/DVMParameterDBTable.java     |  4 +
 .../EnvironmentValuesDBTable.java             |  4 +
 .../GlobalData/Machine/MachinesDBTable.java   |  4 +
 .../GlobalData/Makefile/MakefilesDBTable.java |  4 +
 .../GlobalData/Module/ModulesDBTable.java     |  4 +
 .../RemoteFile/UI/RemoteFileRenderer.java     |  1 -
 .../RunConfigurationsDBTable.java             |  4 +
 .../SapforProfile/SapforProfilesDBTable.java  |  4 +
 .../CompilationTasksDBTable.java              |  4 +
 .../CompilationTasksMenuBar.java              |  1 -
 .../Tasks/RunTask/RunTasksDBTable.java        |  4 +
 .../Tasks/RunTask/RunTasksMenuBar.java        |  1 -
 .../GlobalData/User/UsersDBTable.java         |  4 +
 src/_VisualDVM/MainModule.java                | 56 -----------
 .../ProjectData/DBArray/ArraysDBTable.java    |  4 +
 .../Files/UI/FilesHyperlinksPanel.java        |  1 -
 .../Files/UI/FilesTreeCellRenderer.java       |  1 -
 .../ProjectData/Messages/Message.java         |  2 +-
 .../Project/UI/VersionsTreeCellRenderer.java  |  1 -
 .../SapforData/Arrays/ArraysMenuBar.java      |  1 -
 .../SapforData/Arrays/ArraysSet.java          |  4 +
 .../Arrays/UI/DimensionRenderer.java          |  1 -
 .../Arrays/UI/DimensionStateChanger.java      |  1 -
 .../Arrays/UI/RulesTreeCellRenderer.java      |  1 -
 .../SapforData/Regions/RegionsMenuBar.java    |  1 -
 .../SapforData/Regions/RegionsSet.java        |  4 +
 .../SapforData/Variants/VariantsSet.java      |  5 +
 .../BugReport/BugReportsDBTable.java          |  4 +
 .../Repository/Component/ComponentsSet.java   |  5 +
 .../SubscriberWorkspaceDBTable.java           |  4 +
 .../Subscribes/SubsribersDBTable.java         |  4 +
 .../Common/Group/GroupsDBTable.java           |  4 +
 .../Common/Group/UI/AddGroupMenu.java         |  2 +-
 .../Common/Group/UI/EditGroupMenu.java        |  2 +-
 .../Common/MachineProcess/MachineProcess.java |  6 +-
 .../Common/Test/TestDBTable.java              |  4 +
 .../Common/Test/UI/AddTestMenu.java           |  2 +-
 .../Common/Test/UI/EditTestMenu.java          |  2 +-
 .../TestingSystem/Common/TestingBar.java      |  2 +-
 .../DVMConfigurationDBTable.java              |  4 +
 .../DVM/DVMPackage/DVMPackageDBTable.java     |  4 +
 .../DVM/DVMSettings/DVMSettingsDBTable.java   |  5 +
 .../DVM/DVMTasks/DVMRunTasksSet.java          |  4 +
 .../SapforConfigurationDBTable.java           |  4 +
 .../SapforPackage/SapforPackageDBTable.java   |  5 +
 .../SapforSettings/SapforSettingsDBTable.java |  4 +
 .../UI/SapforSettingsCommandFields.java       |  1 -
 .../SapforSettingsCommandsDBTable.java        |  4 +
 .../SAPFOR/SapforTestingPlanner.java          |  6 +-
 .../ServerSapfor/ServerSapforsDBTable.java    |  4 +
 src/_VisualDVM/Visual/MainUI.java             | 94 -------------------
 .../Visual/Menus/ComponentsMenuBar.java       |  2 +-
 .../Menus/CredentialsBar/CredentialsBar.java  |  2 +-
 .../FastAccessMenuBar/FastAccessMenuBar.java  |  2 +-
 .../Visual/Menus/FileMenuBar/FileMenuBar.java |  2 +-
 .../Menus/FileMenuBar/FileSettingsMenu.java   |  2 +-
 .../Menus/MainMenuBar/AnalysesMenu.java       |  2 +-
 .../Menus/MainMenuBar/GlobalCleaningMenu.java |  2 +-
 .../MainMenuBar/LastOpenedProjectsMenu.java   |  2 +-
 .../Visual/Menus/MainMenuBar/MainMenuBar.java |  2 +-
 .../MainMenuBar/TransformationsMenu.java      |  2 +-
 .../VisualiserSettingsMenu.java               |  2 +-
 .../Visual/Menus/PassesSubMenu.java           |  1 -
 .../ProjectMenuBar/ProjectSettingsMenu.java   |  2 +-
 .../Menus/ProjectMenuBar/ProjectViewMenu.java |  2 +-
 .../Visual/Menus/PropertiesSubmenu.java       |  1 -
 .../Visual/Menus/SettingsSubmenu.java         |  1 -
 .../VersionsMenuBar/VersionsMenuBar.java      |  2 +-
 src/_VisualDVM/Visual/UI.java                 | 58 ------------
 .../Visual/Windows/CallbackForm.java          |  2 +-
 .../Visual/Windows/CommentFields.java         |  2 +-
 .../Visual/Windows/ComparisonForm.java        |  2 +-
 .../Visual/Windows/DescriptionFields.java     |  2 +-
 .../Windows/SapforPackagesComparisonForm.java |  2 +-
 104 files changed, 204 insertions(+), 348 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5f1cd1bb..50bf6eee 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,56 +7,39 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesMenuBar.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/DBArraysMenuBar.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysMenuBar.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsMenuBar.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/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/MainModule_.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/TabToolBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/TabToolBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetFilter.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/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ComponentsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.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/_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/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/CredentialsBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/FilesOperationsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/FilesOperationsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StylesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StylesSubmenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/TypesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/TypesSubmenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenuBar.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/CommentFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CommentFields.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DescriptionFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DescriptionFields.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java
index 43911af9..ab2ea82a 100644
--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -42,18 +42,32 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
     }
     protected void createFilters() {
     }
+    public Class getMenuBarClass(){return null;}
     public void mountUI(JPanel content_in) {
         UI_.Clear(content_in);
         //-->
         ui_ = createUI();
         ui_.setContent(content_in);
         //-->
-        if (MainModule_.instance.getUI().menuBars.containsKey(getClass())) {
-            DataMenuBar bar = MainModule_.instance.getUI().menuBars.get(getClass());
-            content_in.add(bar, BorderLayout.NORTH);
-            setFilterUI(count -> MainModule_.instance.getUI().menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
-            if (ui_.hasCheckBox())
-                bar.createSelectionButtons(this);
+        if (getMenuBarClass()!=null){
+            try {
+                DataMenuBar bar = null;
+                if (!MainModule_.instance.getUI().menuBars.containsKey(getClass())) {
+                    bar = (DataMenuBar) getMenuBarClass().newInstance();
+                    MainModule_.instance.getUI().menuBars.put(getClass(), bar);
+                } else {
+                    bar = MainModule_.instance.getUI().menuBars.get(getClass());
+                }
+                content_in.add(bar, BorderLayout.NORTH);
+                //--
+                setFilterUI(count -> MainModule_.instance.getUI().menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
+                if (ui_.hasCheckBox())
+                    bar.createSelectionButtons(this);
+                //--
+            }
+            catch ( Exception ex){
+                ex.printStackTrace();
+            }
         }
         content_in.add(ui_.getDataPanel(), BorderLayout.CENTER);
         //----
diff --git a/src/Common/Passes/Pass.java b/src/Common/Passes/Pass.java
index 0c4c8e62..00119fc8 100644
--- a/src/Common/Passes/Pass.java
+++ b/src/Common/Passes/Pass.java
@@ -8,7 +8,7 @@ import Common.Visual.Controls.PassControl;
 import Common.Visual.Controls.StablePassMenuItem;
 import Common.Visual.UI_;
 import Common.Visual.Windows.PassForm;
-import _VisualDVM.Global; //избавиться когда мейн модуль станет обязательным
+import _VisualDVM.Global;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
diff --git a/src/Common/Visual/Controls/HyperlinksStyledList.java b/src/Common/Visual/Controls/HyperlinksStyledList.java
index 2c651ce4..892cb654 100644
--- a/src/Common/Visual/Controls/HyperlinksStyledList.java
+++ b/src/Common/Visual/Controls/HyperlinksStyledList.java
@@ -1,7 +1,6 @@
 package Common.Visual.Controls;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common.Visual.UI_;
 public class HyperlinksStyledList extends StyledList {
     @Override
     public void applyTheme() {
diff --git a/src/Common/Visual/Controls/MenuBarButton.java b/src/Common/Visual/Controls/MenuBarButton.java
index 5dba8cd7..68bcf094 100644
--- a/src/Common/Visual/Controls/MenuBarButton.java
+++ b/src/Common/Visual/Controls/MenuBarButton.java
@@ -2,7 +2,6 @@ package Common.Visual.Controls;
 import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common.Visual.UI_;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/Common/Visual/Controls/StableMenuItem.java b/src/Common/Visual/Controls/StableMenuItem.java
index 247c1f27..fa00af6a 100644
--- a/src/Common/Visual/Controls/StableMenuItem.java
+++ b/src/Common/Visual/Controls/StableMenuItem.java
@@ -2,7 +2,6 @@ package Common.Visual.Controls;
 import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Menus.VisualiserMenuItem;
-import Common.Visual.UI_;
 
 import javax.swing.*;
 import javax.swing.plaf.ComponentUI;
diff --git a/src/Common/Visual/Controls/StyledList.java b/src/Common/Visual/Controls/StyledList.java
index 99e57878..975783a6 100644
--- a/src/Common/Visual/Controls/StyledList.java
+++ b/src/Common/Visual/Controls/StyledList.java
@@ -2,7 +2,6 @@ package Common.Visual.Controls;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Themes.ThemeElement;
-import Common.Visual.UI_;
 
 import javax.swing.*;
 public class StyledList extends JList implements ThemeElement {
diff --git a/src/Common/Visual/Controls/StyledProgressBar.java b/src/Common/Visual/Controls/StyledProgressBar.java
index 06b42e56..940575d2 100644
--- a/src/Common/Visual/Controls/StyledProgressBar.java
+++ b/src/Common/Visual/Controls/StyledProgressBar.java
@@ -1,7 +1,6 @@
 package Common.Visual.Controls;
 import Common.MainModule_;
 import Common.Visual.Themes.ThemeElement;
-import Common.Visual.UI_;
 
 import javax.swing.*;
 public class StyledProgressBar extends JProgressBar implements ThemeElement {
diff --git a/src/Common/Visual/Controls/TabToolBar.java b/src/Common/Visual/Controls/TabToolBar.java
index 659c2be7..fb3505dc 100644
--- a/src/Common/Visual/Controls/TabToolBar.java
+++ b/src/Common/Visual/Controls/TabToolBar.java
@@ -1,7 +1,7 @@
 package Common.Visual.Controls;
 import Common.MainModule_;
-import _VisualDVM.Passes.PassCode;
 import Common.Visual.Menus.VisualiserMenuBar;
+import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
 import java.awt.event.MouseAdapter;
diff --git a/src/Common/Visual/Menus/DataMenuBar.java b/src/Common/Visual/Menus/DataMenuBar.java
index 191e5562..e7441113 100644
--- a/src/Common/Visual/Menus/DataMenuBar.java
+++ b/src/Common/Visual/Menus/DataMenuBar.java
@@ -15,6 +15,7 @@ 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("?"));
diff --git a/src/Common/Visual/Menus/StyledPopupMenu.java b/src/Common/Visual/Menus/StyledPopupMenu.java
index b1fe66b1..a2c68296 100644
--- a/src/Common/Visual/Menus/StyledPopupMenu.java
+++ b/src/Common/Visual/Menus/StyledPopupMenu.java
@@ -1,7 +1,6 @@
 package Common.Visual.Menus;
 import Common.MainModule_;
 import Common.Visual.Themes.ThemeElement;
-import Common.Visual.UI_;
 
 import javax.swing.*;
 import javax.swing.event.PopupMenuEvent;
diff --git a/src/Common/Visual/Menus/VisualiserMenu.java b/src/Common/Visual/Menus/VisualiserMenu.java
index 6d874ecc..94289fc0 100644
--- a/src/Common/Visual/Menus/VisualiserMenu.java
+++ b/src/Common/Visual/Menus/VisualiserMenu.java
@@ -3,9 +3,6 @@ import Common.MainModule_;
 import Common.Passes.PassCode_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common.Visual.UI_;
-import _VisualDVM.Global;
-import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
 import java.awt.*;
@@ -15,11 +12,6 @@ public class VisualiserMenu extends JMenu {
         setToolTipText(text);
         if (textVisible)
             setText(text);
-        System.out.println("--");
-        System.out.println(MainModule_.instance);
-        System.out.println(MainModule_.instance.getUI());
-        System.out.println(MainModule_.instance.getUI().getTheme());
-        System.out.println("<<");
         setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
         if (!iconPath.isEmpty())
             setIcon(Utils_.getIcon(iconPath));
diff --git a/src/Common/Visual/Menus/VisualiserMenuBar.java b/src/Common/Visual/Menus/VisualiserMenuBar.java
index 62ac7d17..e574d5dc 100644
--- a/src/Common/Visual/Menus/VisualiserMenuBar.java
+++ b/src/Common/Visual/Menus/VisualiserMenuBar.java
@@ -2,7 +2,6 @@ package Common.Visual.Menus;
 import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common.Visual.UI_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 
diff --git a/src/Common/Visual/Menus/VisualiserMenuItem.java b/src/Common/Visual/Menus/VisualiserMenuItem.java
index 37a43034..400640a3 100644
--- a/src/Common/Visual/Menus/VisualiserMenuItem.java
+++ b/src/Common/Visual/Menus/VisualiserMenuItem.java
@@ -2,7 +2,6 @@ package Common.Visual.Menus;
 import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common.Visual.UI_;
 
 import javax.swing.*;
 public class VisualiserMenuItem extends JMenuItem {
diff --git a/src/Common/Visual/Tables/HiddenListRenderer.java b/src/Common/Visual/Tables/HiddenListRenderer.java
index 12159b3e..7b440c34 100644
--- a/src/Common/Visual/Tables/HiddenListRenderer.java
+++ b/src/Common/Visual/Tables/HiddenListRenderer.java
@@ -1,7 +1,6 @@
 package Common.Visual.Tables;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common.Visual.UI_;
 
 import javax.swing.*;
 import java.util.Vector;
diff --git a/src/Common/Visual/Tables/StatusEnumRenderer.java b/src/Common/Visual/Tables/StatusEnumRenderer.java
index a082b6e9..46727f36 100644
--- a/src/Common/Visual/Tables/StatusEnumRenderer.java
+++ b/src/Common/Visual/Tables/StatusEnumRenderer.java
@@ -1,7 +1,6 @@
 package Common.Visual.Tables;
 import Common.MainModule_;
 import Common.Visual.StatusEnum;
-import Common.Visual.UI_;
 
 import javax.swing.*;
 public class StatusEnumRenderer extends RendererCell<StatusEnum> {
diff --git a/src/Common/Visual/Tables/StyledCellLabel.java b/src/Common/Visual/Tables/StyledCellLabel.java
index 2cce5fd5..c6369b43 100644
--- a/src/Common/Visual/Tables/StyledCellLabel.java
+++ b/src/Common/Visual/Tables/StyledCellLabel.java
@@ -2,7 +2,6 @@ package Common.Visual.Tables;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Themes.ThemeElement;
-import Common.Visual.UI_;
 
 import javax.swing.*;
 //наиболее распространенный случай. переотображение текста и/или изображения в ячейке таблицы.
diff --git a/src/Common/Visual/Tables/StyledTable.java b/src/Common/Visual/Tables/StyledTable.java
index b86e3837..9252b6c0 100644
--- a/src/Common/Visual/Tables/StyledTable.java
+++ b/src/Common/Visual/Tables/StyledTable.java
@@ -3,7 +3,6 @@ import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Menus.TableMenu;
 import Common.Visual.Themes.ThemeElement;
-import Common.Visual.UI_;
 
 import javax.swing.*;
 import javax.swing.table.*;
diff --git a/src/Common/Visual/Tables/WrapTextRenderer.java b/src/Common/Visual/Tables/WrapTextRenderer.java
index 7f9b40f2..b85d9902 100644
--- a/src/Common/Visual/Tables/WrapTextRenderer.java
+++ b/src/Common/Visual/Tables/WrapTextRenderer.java
@@ -1,7 +1,6 @@
 package Common.Visual.Tables;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common.Visual.UI_;
 
 import javax.swing.*;
 import javax.swing.table.TableCellRenderer;
diff --git a/src/Common/Visual/Trees/GraphTreeCellRenderer.java b/src/Common/Visual/Trees/GraphTreeCellRenderer.java
index c331e654..c4aacd26 100644
--- a/src/Common/Visual/Trees/GraphTreeCellRenderer.java
+++ b/src/Common/Visual/Trees/GraphTreeCellRenderer.java
@@ -2,7 +2,6 @@ package Common.Visual.Trees;
 import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common.Visual.UI_;
 import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
 
 import javax.swing.*;
diff --git a/src/Common/Visual/Trees/SelectionTreeCellRenderer.java b/src/Common/Visual/Trees/SelectionTreeCellRenderer.java
index 19fb6cda..69b993d5 100644
--- a/src/Common/Visual/Trees/SelectionTreeCellRenderer.java
+++ b/src/Common/Visual/Trees/SelectionTreeCellRenderer.java
@@ -2,7 +2,6 @@ package Common.Visual.Trees;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Selectable;
-import Common.Visual.UI_;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/Common/Visual/Trees/StyledTree.java b/src/Common/Visual/Trees/StyledTree.java
index 7c4485f3..eff7c1f0 100644
--- a/src/Common/Visual/Trees/StyledTree.java
+++ b/src/Common/Visual/Trees/StyledTree.java
@@ -2,7 +2,6 @@ package Common.Visual.Trees;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Themes.ThemeElement;
-import Common.Visual.UI_;
 import _VisualDVM.Visual.Menus.GraphMenu;
 import _VisualDVM.Visual.UI;
 
diff --git a/src/Common/Visual/Trees/StyledTreeCellRenderer.java b/src/Common/Visual/Trees/StyledTreeCellRenderer.java
index 7524cb6c..f155c682 100644
--- a/src/Common/Visual/Trees/StyledTreeCellRenderer.java
+++ b/src/Common/Visual/Trees/StyledTreeCellRenderer.java
@@ -1,7 +1,6 @@
 package Common.Visual.Trees;
 import Common.MainModule_;
 import Common.Visual.Themes.ThemeElement;
-import Common.Visual.UI_;
 
 import javax.swing.tree.DefaultTreeCellRenderer;
 public class StyledTreeCellRenderer extends DefaultTreeCellRenderer implements ThemeElement {
diff --git a/src/Common/Visual/UI_.java b/src/Common/Visual/UI_.java
index 6e4d85d1..7d471106 100644
--- a/src/Common/Visual/UI_.java
+++ b/src/Common/Visual/UI_.java
@@ -1,15 +1,10 @@
 package Common.Visual;
-import Common.Database.Tables.DataSet;
 import Common.Utils.Utils_;
-import Common.Visual.Menus.DataMenuBar;
-import Common.Visual.Themes.DefaultTheme;
-import Common.Visual.Themes.VisualiserTheme;
 
 import javax.swing.*;
 import javax.swing.event.ChangeListener;
 import javax.swing.text.DefaultFormatter;
 import java.awt.*;
-import java.util.LinkedHashMap;
 import java.util.Stack;
 public class UI_ {
     public static boolean active = false; //есть ли интерфейс. в консольных версиях не нужен.
diff --git a/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java b/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java
index 3bd958a7..dd5bc0a5 100644
--- a/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java
+++ b/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java
@@ -1,7 +1,6 @@
 package Common.Visual.Windows.Dialog;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common.Visual.UI_;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/Common/Visual/Windows/Dialog/DialogWrapText.java b/src/Common/Visual/Windows/Dialog/DialogWrapText.java
index 32069015..3f4dc007 100644
--- a/src/Common/Visual/Windows/Dialog/DialogWrapText.java
+++ b/src/Common/Visual/Windows/Dialog/DialogWrapText.java
@@ -1,7 +1,6 @@
 package Common.Visual.Windows.Dialog;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common.Visual.UI_;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
index 903aa8bf..0bff29ae 100644
--- a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
+++ b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
@@ -157,4 +157,8 @@ public class CompilersDBTable extends iDBTable<Compiler> {
     public Current CurrentName() {
         return Current.Compiler;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return CompilersMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java b/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
index 9215f6b2..7d4fcfb2 100644
--- a/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
+++ b/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.CompilerEnvironment.UI;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Tables.DBObjectRenderer;
-import Common.Visual.UI_;
 import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
 public class CompilerEnvironmentValueRenderer extends DBObjectRenderer {
     @Override
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
index 00037f58..41cb4f2b 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.CompilerOption.UI;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Tables.DBObjectRenderer;
-import Common.Visual.UI_;
 import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
 public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
     @Override
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
index dc2e7e82..7b8d4ddc 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.CompilerOption.UI;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Tables.DBObjectRenderer;
-import Common.Visual.UI_;
 import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
 public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
     @Override
diff --git a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
index 8eb45c6c..f7c5a3f6 100644
--- a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
+++ b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
@@ -95,4 +95,8 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
             }
         };
     }
+    @Override
+    public Class getMenuBarClass() {
+        return DVMParametersMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
index fa168952..f995abc8 100644
--- a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
+++ b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
@@ -95,4 +95,8 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
             if (environmentValue.name.equalsIgnoreCase(name_in)) return environmentValue;
         return null;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return EnvironmentValuesMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
index 5c291c5a..3e97c8b8 100644
--- a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
@@ -122,4 +122,8 @@ public class MachinesDBTable extends iDBTable<Machine> {
     public boolean LocalMachineExists() {
         return Data.values().stream().anyMatch(machine -> machine.type.equals(MachineType.Local));
     }
+    @Override
+    public Class getMenuBarClass() {
+        return MachinesMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java b/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
index 05452990..a06407a7 100644
--- a/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
@@ -70,4 +70,8 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
     public Current CurrentName() {
         return Current.Makefile;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return MakefilesMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java b/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
index e48ee77e..12ef9300 100644
--- a/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
@@ -62,4 +62,8 @@ public class ModulesDBTable extends iDBTable<Module> {
     public Current CurrentName() {
         return Current.Module;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return ModulesMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
index 2cd3e625..bc23b5b1 100644
--- a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
+++ b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.RemoteFile.UI;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Trees.StyledTreeCellRenderer;
-import Common.Visual.UI_;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 
 import javax.swing.*;
diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
index 5ae900e4..46144dac 100644
--- a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
+++ b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
@@ -166,4 +166,8 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
             getDb().Update(c);
         }
     }
+    @Override
+    public Class getMenuBarClass() {
+        return RunConfigurationsMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java b/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
index 8e5223e0..5f20ee1c 100644
--- a/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
+++ b/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
@@ -65,4 +65,8 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
         res.put(SapforProfileSetting.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
         return res;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return SapforProfilesMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
index 59240785..dcfc0959 100644
--- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
@@ -120,4 +120,8 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
     public Current CurrentName() {
         return Current.CompilationTask;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return CompilationTasksMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java
index ef4c9840..5d474e6d 100644
--- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java
@@ -1,6 +1,5 @@
 package _VisualDVM.GlobalData.Tasks.CompilationTask;
 import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
 public class CompilationTasksMenuBar extends DataMenuBar {
     public CompilationTasksMenuBar() {
         super("задачи на компиляцию");
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
index 4515d5e6..3d112e47 100644
--- a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
@@ -85,4 +85,8 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
     public Current CurrentName() {
         return Current.RunTask;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return RunTasksMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java
index 2e110bfe..c95dc70a 100644
--- a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java
@@ -1,6 +1,5 @@
 package _VisualDVM.GlobalData.Tasks.RunTask;
 import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
 public class RunTasksMenuBar extends DataMenuBar {
     public RunTasksMenuBar() {
         super("задачи на запуск");
diff --git a/src/_VisualDVM/GlobalData/User/UsersDBTable.java b/src/_VisualDVM/GlobalData/User/UsersDBTable.java
index 5c38be0e..dd49b9e0 100644
--- a/src/_VisualDVM/GlobalData/User/UsersDBTable.java
+++ b/src/_VisualDVM/GlobalData/User/UsersDBTable.java
@@ -111,4 +111,8 @@ public class UsersDBTable extends iDBTable<User> {
     public Current CurrentName() {
         return Current.User;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return UsersMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/MainModule.java b/src/_VisualDVM/MainModule.java
index a714d45d..0b074ae7 100644
--- a/src/_VisualDVM/MainModule.java
+++ b/src/_VisualDVM/MainModule.java
@@ -1,96 +1,40 @@
 package _VisualDVM;
-import Common.Database.Tables.DataSet;
 import Common.MainModule_;
 import Common.Utils.Vector_;
-import Common.Visual.Menus.DataMenuBar;
-import Common.Visual.UI_;
 import _VisualDVM.GlobalData.Account.Account;
 import _VisualDVM.GlobalData.Compiler.Compiler;
-import _VisualDVM.GlobalData.Compiler.CompilersDBTable;
-import _VisualDVM.GlobalData.Compiler.CompilersMenuBar;
 import _VisualDVM.GlobalData.Credentials.Credentials;
-import _VisualDVM.GlobalData.DVMParameter.DVMParameterDBTable;
-import _VisualDVM.GlobalData.DVMParameter.DVMParametersMenuBar;
-import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
-import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesMenuBar;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.GlobalData.Machine.Machine;
-import _VisualDVM.GlobalData.Machine.MachinesDBTable;
-import _VisualDVM.GlobalData.Machine.MachinesMenuBar;
 import _VisualDVM.GlobalData.Makefile.Makefile;
-import _VisualDVM.GlobalData.Makefile.MakefilesDBTable;
-import _VisualDVM.GlobalData.Makefile.MakefilesMenuBar;
 import _VisualDVM.GlobalData.Module.Module;
-import _VisualDVM.GlobalData.Module.ModulesDBTable;
-import _VisualDVM.GlobalData.Module.ModulesMenuBar;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
-import _VisualDVM.GlobalData.RunConfiguration.RunConfigurationsDBTable;
-import _VisualDVM.GlobalData.RunConfiguration.RunConfigurationsMenuBar;
 import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
-import _VisualDVM.GlobalData.SapforProfile.SapforProfilesDBTable;
 import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
-import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
-import _VisualDVM.GlobalData.Tasks.RunTask.RunTasksDBTable;
 import _VisualDVM.GlobalData.User.User;
-import _VisualDVM.GlobalData.User.UsersDBTable;
-import _VisualDVM.GlobalData.User.UsersMenuBar;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.ProjectData.DBArray.ArraysDBTable;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.ProjectData.ProjectView;
-import _VisualDVM.ProjectData.SapforData.Arrays.ArraysSet;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
-import _VisualDVM.ProjectData.SapforData.Regions.RegionsSet;
-import _VisualDVM.ProjectData.SapforData.Variants.VariantsSet;
 import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.BugReportsDBTable;
-import _VisualDVM.Repository.BugReport.BugReportsMenuBar;
 import _VisualDVM.Repository.Component.Component;
 import _VisualDVM.Repository.Component.Sapfor.Sapfor;
 import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
-import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable;
-import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspacesMenuBar;
 import _VisualDVM.Repository.Subscribes.Subscriber;
-import _VisualDVM.Repository.Subscribes.SubscribersMenuBar;
-import _VisualDVM.Repository.Subscribes.SubsribersDBTable;
 import _VisualDVM.TestingSystem.Common.Group.Group;
-import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
-import _VisualDVM.TestingSystem.Common.Group.GroupsMenuBar;
 import _VisualDVM.TestingSystem.Common.Test.Test;
-import _VisualDVM.TestingSystem.Common.Test.TestDBTable;
-import _VisualDVM.TestingSystem.Common.Test.TestsMenuBar;
 import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
-import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfigurationDBTable;
-import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfigurationsMenuBar;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
-import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
-import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackagesBar;
-import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettingsDBTable;
-import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsBar;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
-import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTasksBar;
-import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTasksSet;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
-import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationsMenuBar;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
-import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettingsBar;
-import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettingsDBTable;
-import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommandsBar;
-import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommandsDBTable;
-import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackagesBar;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
-import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsBar;
-import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
 import _VisualDVM.Visual.MainUI;
-import _VisualDVM.Visual.Menus.VariantsMenuBar.VariantsMenuBar;
-import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.File;
diff --git a/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java b/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
index 563d5f07..6dbcb043 100644
--- a/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
+++ b/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
@@ -46,4 +46,8 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
     public Current CurrentName() {
         return Current.DBArray;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return DBArraysMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java b/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
index adb4f35a..1242c29f 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
@@ -1,7 +1,6 @@
 package _VisualDVM.ProjectData.Files.UI;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common.Visual.UI_;
 import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
diff --git a/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java b/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java
index 7958e884..00334b01 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java
@@ -2,7 +2,6 @@ package _VisualDVM.ProjectData.Files.UI;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Trees.StyledTreeCellRenderer;
-import Common.Visual.UI_;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.FileState;
diff --git a/src/_VisualDVM/ProjectData/Messages/Message.java b/src/_VisualDVM/ProjectData/Messages/Message.java
index 36cc37d1..b50c05ba 100644
--- a/src/_VisualDVM/ProjectData/Messages/Message.java
+++ b/src/_VisualDVM/ProjectData/Messages/Message.java
@@ -1,11 +1,11 @@
 package _VisualDVM.ProjectData.Messages;
-import _VisualDVM.Mode;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Settings.SettingName;
+import _VisualDVM.Mode;
 import _VisualDVM.ProjectData.SapforData.FileObject;
 import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
 
diff --git a/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java b/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java
index e1472e70..0dad2505 100644
--- a/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java
+++ b/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java
@@ -3,7 +3,6 @@ import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Selectable;
 import Common.Visual.Trees.StyledTreeCellRenderer;
-import Common.Visual.UI_;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Project.db_project_info;
 
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysMenuBar.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysMenuBar.java
index 7a224ae2..2e9ceaef 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysMenuBar.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysMenuBar.java
@@ -1,6 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Arrays;
 import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
 public class ArraysMenuBar extends DataMenuBar {
     public ArraysMenuBar() {
         super("массивы");
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
index c5ec7f0c..9e7c6e02 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
@@ -78,4 +78,8 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
     public void CheckAll(boolean flag) {
         Global.mainModule.getPass(PassCode.MassSelectArrays).Do(flag, new Vector(Global.mainModule.getProject().declaratedArrays.Data.values()));
     }
+    @Override
+    public Class getMenuBarClass() {
+        return ArraysMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
index 54bd2ecc..8799d636 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
@@ -2,7 +2,6 @@ package _VisualDVM.ProjectData.SapforData.Arrays.UI;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Tables.RendererCell;
-import Common.Visual.UI_;
 import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
 
 import javax.swing.*;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
index 722aed05..a9876f9f 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
@@ -2,7 +2,6 @@ package _VisualDVM.ProjectData.SapforData.Arrays.UI;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Tables.DBObjectEditor;
-import Common.Visual.UI_;
 import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
 import _VisualDVM.Visual.UI;
 
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
index 217870ed..d11d828b 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
@@ -2,7 +2,6 @@ package _VisualDVM.ProjectData.SapforData.Arrays.UI;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Trees.StyledTreeCellRenderer;
-import Common.Visual.UI_;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
 
 import javax.swing.*;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsMenuBar.java b/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsMenuBar.java
index 3e042430..bc2aa8ac 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsMenuBar.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsMenuBar.java
@@ -1,6 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Regions;
 import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
 public class RegionsMenuBar extends DataMenuBar {
     public RegionsMenuBar() {
         super("области распараллеливания");
diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java b/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
index fae4b54f..ce87645b 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
@@ -61,4 +61,8 @@ public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
     public String[] getUIColumnNames() {
         return new String[]{"Имя", "Строк кода", "Массивов", "Циклов", "Объявлений процедур", "Вызовов процедур", "Фрагменты"};
     }
+    @Override
+    public Class getMenuBarClass() {
+        return RegionsMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java b/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java
index bf3ee0e0..c0e71ab3 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java
@@ -2,6 +2,7 @@ package _VisualDVM.ProjectData.SapforData.Variants;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 import _VisualDVM.Current;
+import _VisualDVM.Visual.Menus.VariantsMenuBar.VariantsMenuBar;
 
 import static Common.Visual.Tables.TableRenderers.*;
 public class VariantsSet extends DataSet<String, ParallelVariant> {
@@ -70,4 +71,8 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
     public Current CurrentName() {
         return Current.ParallelVariant;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return VariantsMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
index 9c5b75b1..b07bddc6 100644
--- a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
+++ b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
@@ -112,4 +112,8 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
     public Vector<BugReport> getAllDrafts() throws Exception {
         return Data.values().stream().filter(bugReport -> bugReport.state.equals(BugReportState.draft)).collect(Collectors.toCollection(Vector::new));
     }
+    @Override
+    public Class getMenuBarClass() {
+        return BugReportsMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/Repository/Component/ComponentsSet.java b/src/_VisualDVM/Repository/Component/ComponentsSet.java
index 4ce08b61..e8b4cb91 100644
--- a/src/_VisualDVM/Repository/Component/ComponentsSet.java
+++ b/src/_VisualDVM/Repository/Component/ComponentsSet.java
@@ -2,6 +2,7 @@ package _VisualDVM.Repository.Component;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 import _VisualDVM.Current;
+import _VisualDVM.Visual.Menus.ComponentsMenuBar;
 
 import java.util.Vector;
 
@@ -85,4 +86,8 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
             target.add(server);
         return target;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return ComponentsMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java b/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
index e2f5471b..5899c7c0 100644
--- a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
+++ b/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
@@ -46,4 +46,8 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
         }
         return null;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return SubscriberWorkspacesMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java b/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
index 92abed1d..1733bb80 100644
--- a/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
+++ b/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
@@ -70,4 +70,8 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
         res.put(SubscriberWorkspace.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
         return res;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return SubscribersMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
index 441d2cde..7baf46ba 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
@@ -145,4 +145,8 @@ public class GroupsDBTable extends iDBTable<Group> {
         }
         return null;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return GroupsMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java
index 94b010f5..bdb83a3d 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java
@@ -1,6 +1,6 @@
 package _VisualDVM.TestingSystem.Common.Group.UI;
-import _VisualDVM.Passes.PassCode;
 import Common.Visual.Menus.VisualiserMenu;
+import _VisualDVM.Passes.PassCode;
 public class AddGroupMenu extends VisualiserMenu {
     public AddGroupMenu() {
         super("", "/icons/RedAdd.png");
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java
index 9c9f762f..e7997265 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java
@@ -1,6 +1,6 @@
 package _VisualDVM.TestingSystem.Common.Group.UI;
-import _VisualDVM.Passes.PassCode;
 import Common.Visual.Menus.VisualiserMenu;
+import _VisualDVM.Passes.PassCode;
 public class EditGroupMenu extends VisualiserMenu {
     public EditGroupMenu() {
         super("", "/icons/Edit.png");
diff --git a/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java b/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java
index 9b92b1fc..db39c2a4 100644
--- a/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java
+++ b/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java
@@ -1,13 +1,9 @@
 package _VisualDVM.TestingSystem.Common.MachineProcess;
 import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
-import _VisualDVM.Mode;
 import Common.Utils.Utils_;
-import _VisualDVM.Constants;
-import _VisualDVM.Global;
-import _VisualDVM.GlobalProperties;
+import _VisualDVM.*;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
-import _VisualDVM.Utils;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java b/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
index 983167a1..0d6870f4 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
@@ -124,4 +124,8 @@ public class TestDBTable extends iDBTable<Test> {
         }
         return selectedTests.isEmpty() ? allTests : selectedTests;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return TestsMenuBar.class;
+    }
 }
\ No newline at end of file
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java
index 9270cf4c..67f9f6e0 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java
@@ -1,7 +1,7 @@
 package _VisualDVM.TestingSystem.Common.Test.UI;
+import Common.Visual.Menus.VisualiserMenu;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import Common.Visual.Menus.VisualiserMenu;
 public class AddTestMenu extends VisualiserMenu {
     public AddTestMenu() {
         super("Добавление теста", "/icons/RedAdd.png", false);
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java
index a8db80b4..0deede5a 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java
@@ -1,7 +1,7 @@
 package _VisualDVM.TestingSystem.Common.Test.UI;
+import Common.Visual.Menus.VisualiserMenu;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import Common.Visual.Menus.VisualiserMenu;
 public class EditTestMenu extends VisualiserMenu {
     public EditTestMenu() {
         super("Редактирование теста", "/icons/Edit.png", false);
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingBar.java b/src/_VisualDVM/TestingSystem/Common/TestingBar.java
index a384ca40..0a5a4b18 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingBar.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingBar.java
@@ -3,10 +3,10 @@ import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.Fonts.VisualiserFonts;
+import Common.Visual.Menus.VisualiserMenuBar;
 import Common.Visual.UI_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import Common.Visual.Menus.VisualiserMenuBar;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
index 21024a09..21345d99 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
@@ -114,4 +114,8 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
     public boolean ShowEditObjectDialog(DBObject object) {
         return (Global.mainModule.getAccount().CheckAccessRights(((DVMConfiguration) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
     }
+    @Override
+    public Class getMenuBarClass() {
+        return DVMConfigurationsMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index 0cb937a9..c542a15f 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -122,4 +122,8 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
         };
         // return Comparator.comparingInt(o -> o.).reversed();
     }
+    @Override
+    public Class getMenuBarClass() {
+        return DVMPackagesBar.class;
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
index 59655185..27f67747 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
@@ -5,6 +5,7 @@ import Common.Visual.DataSetControlForm;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
+import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsBar;
 import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields;
 public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
     public DVMSettingsDBTable() {
@@ -144,4 +145,8 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
     public boolean ShowEditObjectDialog(DBObject object) {
         return (Global.mainModule.getAccount().CheckAccessRights(((DVMSettings) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
     }
+    @Override
+    public Class getMenuBarClass() {
+        return DVMSettingsBar.class;
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
index 78de51a7..665092b2 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
@@ -162,4 +162,8 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
         };
         // return Comparator.comparingInt(o -> o.).reversed();
     }
+    @Override
+    public Class getMenuBarClass() {
+        return DVMRunTasksBar.class;
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
index fcc66c37..3b1e0bec 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
@@ -127,4 +127,8 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
                 return sapforConfiguration;
         return null;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return SapforConfigurationsMenuBar.class;
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
index 8ca0e1a5..04d3173b 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
@@ -6,6 +6,7 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.PackageCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
+import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackagesBar;
 
 import java.util.Comparator;
 import java.util.Date;
@@ -100,4 +101,8 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
         };
         // return Comparator.comparingInt(o -> o.).reversed();
     }
+    @Override
+    public Class getMenuBarClass() {
+        return SapforPackagesBar.class;
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
index 695b4a55..1efdd769 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
@@ -115,4 +115,8 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
         res.put(SapforSettingsCommand.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
         return res;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return SapforSettingsBar.class;
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
index c5791975..43bc40eb 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
@@ -1,7 +1,6 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
 import Common.MainModule_;
 import Common.Visual.Tables.StyledCellLabel;
-import Common.Visual.UI_;
 import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.Component.Sapfor.Sapfor;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
index b83f8b8f..b3ead076 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
@@ -81,4 +81,8 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
         }
         return res;
     }
+    @Override
+    public Class getMenuBarClass() {
+        return SapforSettingsCommandsBar.class;
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
index a3110411..69a1f59f 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -1,10 +1,7 @@
 package _VisualDVM.TestingSystem.SAPFOR;
 import Common.CommonConstants;
-import _VisualDVM.Mode;
 import Common.Utils.Utils_;
-import _VisualDVM.Constants;
-import _VisualDVM.Global;
-import _VisualDVM.GlobalProperties;
+import _VisualDVM.*;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.Repository.Component.Sapfor.Sapfor;
 import _VisualDVM.Repository.EmailMessage;
@@ -17,7 +14,6 @@ import _VisualDVM.TestingSystem.SAPFOR.Json.SapforTestingSet_json;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
-import _VisualDVM.Utils;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
index cc38ef1b..2b17471c 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
@@ -71,4 +71,8 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
         };
         // return Comparator.comparingInt(o -> o.).reversed();
     }
+    @Override
+    public Class getMenuBarClass() {
+        return ServerSapforsBar.class;
+    }
 }
diff --git a/src/_VisualDVM/Visual/MainUI.java b/src/_VisualDVM/Visual/MainUI.java
index 79ff29fb..66a52768 100644
--- a/src/_VisualDVM/Visual/MainUI.java
+++ b/src/_VisualDVM/Visual/MainUI.java
@@ -1,102 +1,8 @@
 package _VisualDVM.Visual;
 import Common.Visual.UIModule_;
-import _VisualDVM.GlobalData.Compiler.CompilersDBTable;
-import _VisualDVM.GlobalData.Compiler.CompilersMenuBar;
-import _VisualDVM.GlobalData.DVMParameter.DVMParameterDBTable;
-import _VisualDVM.GlobalData.DVMParameter.DVMParametersMenuBar;
-import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
-import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesMenuBar;
-import _VisualDVM.GlobalData.Machine.MachinesDBTable;
-import _VisualDVM.GlobalData.Machine.MachinesMenuBar;
-import _VisualDVM.GlobalData.Makefile.MakefilesDBTable;
-import _VisualDVM.GlobalData.Makefile.MakefilesMenuBar;
-import _VisualDVM.GlobalData.Module.ModulesDBTable;
-import _VisualDVM.GlobalData.Module.ModulesMenuBar;
-import _VisualDVM.GlobalData.RunConfiguration.RunConfigurationsDBTable;
-import _VisualDVM.GlobalData.RunConfiguration.RunConfigurationsMenuBar;
-import _VisualDVM.GlobalData.SapforProfile.SapforProfilesDBTable;
-import _VisualDVM.GlobalData.SapforProfile.SapforProfilesMenuBar;
-import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
-import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTasksMenuBar;
-import _VisualDVM.GlobalData.Tasks.RunTask.RunTasksDBTable;
-import _VisualDVM.GlobalData.Tasks.RunTask.RunTasksMenuBar;
-import _VisualDVM.GlobalData.User.UsersDBTable;
-import _VisualDVM.GlobalData.User.UsersMenuBar;
-import _VisualDVM.ProjectData.DBArray.ArraysDBTable;
-import _VisualDVM.ProjectData.DBArray.DBArraysMenuBar;
-import _VisualDVM.ProjectData.SapforData.Arrays.ArraysMenuBar;
-import _VisualDVM.ProjectData.SapforData.Arrays.ArraysSet;
-import _VisualDVM.ProjectData.SapforData.Regions.RegionsMenuBar;
-import _VisualDVM.ProjectData.SapforData.Regions.RegionsSet;
-import _VisualDVM.ProjectData.SapforData.Variants.VariantsSet;
-import _VisualDVM.Repository.BugReport.BugReportsDBTable;
-import _VisualDVM.Repository.BugReport.BugReportsMenuBar;
-import _VisualDVM.Visual.Menus.ComponentsMenuBar;
-import _VisualDVM.Repository.Component.ComponentsSet;
-import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable;
-import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspacesMenuBar;
-import _VisualDVM.Repository.Subscribes.SubscribersMenuBar;
-import _VisualDVM.Repository.Subscribes.SubsribersDBTable;
-import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
-import _VisualDVM.TestingSystem.Common.Group.GroupsMenuBar;
-import _VisualDVM.TestingSystem.Common.Test.TestDBTable;
-import _VisualDVM.TestingSystem.Common.Test.TestsMenuBar;
-import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfigurationDBTable;
-import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfigurationsMenuBar;
-import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
-import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackagesBar;
-import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettingsDBTable;
-import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsBar;
-import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTasksBar;
-import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTasksSet;
-import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
-import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationsMenuBar;
-import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
-import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettingsBar;
-import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettingsDBTable;
-import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommandsBar;
-import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommandsDBTable;
-import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackagesBar;
-import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsBar;
-import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
-import _VisualDVM.Visual.Menus.VariantsMenuBar.VariantsMenuBar;
 import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
 public class MainUI extends UIModule_ {
     public MainUI(){
         setTheme(new LightSPFEditorTheme());
-        menuBars.put(ComponentsSet.class, new ComponentsMenuBar());
-        menuBars.put(BugReportsDBTable.class, new BugReportsMenuBar());
-        menuBars.put(SubscriberWorkspaceDBTable.class, new SubscriberWorkspacesMenuBar());
-        //---------------------------------------------------->>
-        menuBars.put(GroupsDBTable.class, new GroupsMenuBar());
-        menuBars.put(TestDBTable.class, new TestsMenuBar());
-        menuBars.put(DVMConfigurationDBTable.class, new DVMConfigurationsMenuBar());
-        menuBars.put(DVMPackageDBTable.class, new DVMPackagesBar());
-        menuBars.put(SapforPackageDBTable.class, new SapforPackagesBar());
-        menuBars.put(DVMRunTasksSet.class, new DVMRunTasksBar());
-        //--->>>
-        menuBars.put(MachinesDBTable.class, new MachinesMenuBar());
-        menuBars.put(UsersDBTable.class, new UsersMenuBar());
-        menuBars.put(CompilersDBTable.class, new CompilersMenuBar());
-        menuBars.put(MakefilesDBTable.class, new MakefilesMenuBar());
-        menuBars.put(ModulesDBTable.class, new ModulesMenuBar());
-        menuBars.put(RunConfigurationsDBTable.class, new RunConfigurationsMenuBar());
-        menuBars.put(EnvironmentValuesDBTable.class, new EnvironmentValuesMenuBar());
-        menuBars.put(DVMParameterDBTable.class, new DVMParametersMenuBar());
-        menuBars.put(CompilationTasksDBTable.class, new CompilationTasksMenuBar());
-        menuBars.put(RunTasksDBTable.class, new RunTasksMenuBar());
-        //---->>
-        menuBars.put(SapforConfigurationDBTable.class, new SapforConfigurationsMenuBar());
-        //---->>
-        menuBars.put(RegionsSet.class, new RegionsMenuBar());
-        menuBars.put(ArraysSet.class, new ArraysMenuBar());
-        menuBars.put(ArraysDBTable.class, new DBArraysMenuBar());
-        menuBars.put(VariantsSet.class, new VariantsMenuBar());
-        menuBars.put(SubsribersDBTable.class, new SubscribersMenuBar());
-        menuBars.put(SapforProfilesDBTable.class, new SapforProfilesMenuBar());
-        menuBars.put(ServerSapforsDBTable.class, new ServerSapforsBar());
-        menuBars.put(SapforSettingsDBTable.class, new SapforSettingsBar());
-        menuBars.put(SapforSettingsCommandsDBTable.class, new SapforSettingsCommandsBar());
-        menuBars.put(DVMSettingsDBTable.class, new DVMSettingsBar());
     }
 }
diff --git a/src/_VisualDVM/Visual/Menus/ComponentsMenuBar.java b/src/_VisualDVM/Visual/Menus/ComponentsMenuBar.java
index 424d3fe9..1b8c5bf5 100644
--- a/src/_VisualDVM/Visual/Menus/ComponentsMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/ComponentsMenuBar.java
@@ -2,9 +2,9 @@ package _VisualDVM.Visual.Menus;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Menus.VisualiserMenu;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import Common.Visual.Menus.VisualiserMenu;
 public class ComponentsMenuBar extends DataMenuBar {
     public ComponentsMenuBar() {
         super("компоненты");
diff --git a/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java b/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java
index 646f9e23..10ff1d38 100644
--- a/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java
+++ b/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java
@@ -1,9 +1,9 @@
 package _VisualDVM.Visual.Menus.CredentialsBar;
 import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.Fonts.VisualiserFonts;
+import Common.Visual.Menus.VisualiserMenuBar;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import Common.Visual.Menus.VisualiserMenuBar;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
diff --git a/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java b/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
index 81599b6a..67ff5068 100644
--- a/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
@@ -1,10 +1,10 @@
 package _VisualDVM.Visual.Menus.FastAccessMenuBar;
 import Common.MainModule_;
 import Common.Passes.Pass;
+import Common.Visual.Menus.VisualiserMenuBar;
 import Common.Visual.UI_;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Settings.SettingName;
-import Common.Visual.Menus.VisualiserMenuBar;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java
index 9e71a022..9de5bdd3 100644
--- a/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java
@@ -1,8 +1,8 @@
 package _VisualDVM.Visual.Menus.FileMenuBar;
 import Common.Visual.Controls.MenuBarButton;
+import Common.Visual.Menus.VisualiserMenuBar;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
-import Common.Visual.Menus.VisualiserMenuBar;
 import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
diff --git a/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java
index a18c5274..691a6c5f 100644
--- a/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Menus.FileMenuBar;
+import Common.Visual.Menus.VisualiserMenu;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Files.FileType;
 import _VisualDVM.ProjectData.Files.LanguageStyle;
@@ -6,7 +7,6 @@ import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.Visual.Menus.LanguagesSubmenu;
 import _VisualDVM.Visual.Menus.StylesSubmenu;
 import _VisualDVM.Visual.Menus.TypesSubmenu;
-import Common.Visual.Menus.VisualiserMenu;
 import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java
index 6f154b06..49891bcb 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java
@@ -1,8 +1,8 @@
 package _VisualDVM.Visual.Menus.MainMenuBar;
+import Common.Visual.Menus.VisualiserMenu;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.Component.Sapfor.Sapfor;
-import Common.Visual.Menus.VisualiserMenu;
 public class AnalysesMenu extends VisualiserMenu {
     public AnalysesMenu() {
         super("Анализаторы", "/icons/Analyses.png");
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java
index d87a05e0..ae45f8e8 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Menus.MainMenuBar;
-import _VisualDVM.Passes.PassCode;
 import Common.Visual.Menus.VisualiserMenu;
+import _VisualDVM.Passes.PassCode;
 public class GlobalCleaningMenu extends VisualiserMenu {
     public GlobalCleaningMenu() {
         super("Очистка", "/icons/Clean.png", false);
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
index aa49c877..9710c1f0 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
@@ -1,10 +1,10 @@
 package _VisualDVM.Visual.Menus.MainMenuBar;
+import Common.Visual.Menus.VisualiserMenu;
 import Common.Visual.Menus.VisualiserMenuItem;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.DBLastProject.DBLastProject;
 import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.Passes.PassCode;
-import Common.Visual.Menus.VisualiserMenu;
 
 import javax.swing.*;
 import javax.swing.event.MenuEvent;
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
index c751c49d..35f97cdb 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
@@ -1,12 +1,12 @@
 package _VisualDVM.Visual.Menus.MainMenuBar;
 import Common.Passes.Pass;
 import Common.Visual.Controls.MenuBarButton;
+import Common.Visual.Menus.VisualiserMenuBar;
 import Common.Visual.UI_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
 import _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu.VisualiserSettingsMenu;
-import Common.Visual.Menus.VisualiserMenuBar;
 import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java
index 1338ba4c..dab6b7bc 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java
@@ -1,9 +1,9 @@
 package _VisualDVM.Visual.Menus.MainMenuBar;
+import Common.Visual.Menus.VisualiserMenu;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.Component.Sapfor.Sapfor;
 import _VisualDVM.Visual.Menus.PassesSubMenu;
-import Common.Visual.Menus.VisualiserMenu;
 public class TransformationsMenu extends VisualiserMenu {
     public TransformationsMenu() {
         super("Преобразования", "/icons/Transformations.png");
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
index bf203e9f..a1a12271 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
@@ -1,10 +1,10 @@
 package _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu;
 import Common.Utils.Utils_;
+import Common.Visual.Menus.VisualiserMenu;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.Visual.Menus.PropertiesSubmenu;
 import _VisualDVM.Visual.Menus.SettingsSubmenu;
-import Common.Visual.Menus.VisualiserMenu;
 public class VisualiserSettingsMenu extends VisualiserMenu {
     public VisualiserSettingsMenu() {
         super("Настройки визуализатора", "/icons/Settings.png");
diff --git a/src/_VisualDVM/Visual/Menus/PassesSubMenu.java b/src/_VisualDVM/Visual/Menus/PassesSubMenu.java
index 76e2ab57..e1af49d3 100644
--- a/src/_VisualDVM/Visual/Menus/PassesSubMenu.java
+++ b/src/_VisualDVM/Visual/Menus/PassesSubMenu.java
@@ -2,7 +2,6 @@ package _VisualDVM.Visual.Menus;
 import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common.Visual.UI_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 
diff --git a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java
index f246d844..f7fb71a6 100644
--- a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Menus.ProjectMenuBar;
+import Common.Visual.Menus.VisualiserMenu;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.ProjectData.Files.LanguageStyle;
@@ -6,7 +7,6 @@ import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.Visual.Menus.LanguagesSubmenu;
 import _VisualDVM.Visual.Menus.SettingsSubmenu;
 import _VisualDVM.Visual.Menus.StylesSubmenu;
-import Common.Visual.Menus.VisualiserMenu;
 
 import javax.swing.*;
 public class ProjectSettingsMenu extends VisualiserMenu {
diff --git a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
index 166f4473..3205a3e1 100644
--- a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
+++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
@@ -2,10 +2,10 @@ package _VisualDVM.Visual.Menus.ProjectMenuBar;
 import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
+import Common.Visual.Menus.VisualiserMenu;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.ProjectView;
-import Common.Visual.Menus.VisualiserMenu;
 import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
diff --git a/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java b/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java
index d5e0d574..1881d403 100644
--- a/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java
+++ b/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java
@@ -2,7 +2,6 @@ package _VisualDVM.Visual.Menus;
 import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common.Visual.UI_;
 import _VisualDVM.Global;
 
 import javax.swing.*;
diff --git a/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java b/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java
index b37a8c97..059c9c87 100644
--- a/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java
+++ b/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java
@@ -2,7 +2,6 @@ package _VisualDVM.Visual.Menus;
 import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common.Visual.UI_;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Settings.SettingName;
 
diff --git a/src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java b/src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java
index eeec2a04..b6c547eb 100644
--- a/src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java
@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Menus.VersionsMenuBar;
-import _VisualDVM.Passes.PassCode;
 import Common.Visual.Menus.VisualiserMenuBar;
+import _VisualDVM.Passes.PassCode;
 public class VersionsMenuBar extends VisualiserMenuBar {
     public VersionsMenuBar() {
         addPasses(PassCode.CreateTestsGroupFromSelectedVersions);
diff --git a/src/_VisualDVM/Visual/UI.java b/src/_VisualDVM/Visual/UI.java
index 339ed5d1..9bba523b 100644
--- a/src/_VisualDVM/Visual/UI.java
+++ b/src/_VisualDVM/Visual/UI.java
@@ -1,89 +1,31 @@
 package _VisualDVM.Visual;
-import Common.Database.Tables.DataSet;
-import Common.MainModule_;
-import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.*;
 import Common.Visual.Trees.GraphTreeCellRenderer;
 import Common.Visual.Trees.SelectionTreeCellRenderer;
-import Common.Visual.UI_;
 import _VisualDVM.Global;
-import _VisualDVM.GlobalData.Compiler.CompilersDBTable;
-import _VisualDVM.GlobalData.Compiler.CompilersMenuBar;
 import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
 import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer;
 import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer;
 import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueEditor;
 import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
-import _VisualDVM.GlobalData.DVMParameter.DVMParameterDBTable;
-import _VisualDVM.GlobalData.DVMParameter.DVMParametersMenuBar;
-import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
-import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesMenuBar;
-import _VisualDVM.GlobalData.Machine.MachinesDBTable;
-import _VisualDVM.GlobalData.Machine.MachinesMenuBar;
-import _VisualDVM.GlobalData.Makefile.MakefilesDBTable;
-import _VisualDVM.GlobalData.Makefile.MakefilesMenuBar;
-import _VisualDVM.GlobalData.Module.ModulesDBTable;
-import _VisualDVM.GlobalData.Module.ModulesMenuBar;
 import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileChooser;
 import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileRenderer;
-import _VisualDVM.GlobalData.RunConfiguration.RunConfigurationsDBTable;
-import _VisualDVM.GlobalData.RunConfiguration.RunConfigurationsMenuBar;
-import _VisualDVM.GlobalData.SapforProfile.SapforProfilesDBTable;
 import _VisualDVM.GlobalData.Settings.SettingName;
-import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
-import _VisualDVM.GlobalData.Tasks.RunTask.RunTasksDBTable;
-import _VisualDVM.GlobalData.User.UsersDBTable;
-import _VisualDVM.GlobalData.User.UsersMenuBar;
-import _VisualDVM.Passes.PassCode;
-import _VisualDVM.ProjectData.DBArray.ArraysDBTable;
 import _VisualDVM.ProjectData.Files.UI.FilesTreeCellRenderer;
 import _VisualDVM.ProjectData.Project.UI.VersionsTreeCellRenderer;
-import _VisualDVM.ProjectData.SapforData.Arrays.ArraysSet;
 import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionRenderer;
 import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionStateChanger;
 import _VisualDVM.ProjectData.SapforData.Arrays.UI.RulesTreeCellRenderer;
-import _VisualDVM.ProjectData.SapforData.Regions.RegionsSet;
 import _VisualDVM.ProjectData.SapforData.Variants.UI.VariantRankRenderer;
-import _VisualDVM.ProjectData.SapforData.Variants.VariantsSet;
-import _VisualDVM.Repository.BugReport.BugReportsDBTable;
-import _VisualDVM.Repository.BugReport.BugReportsMenuBar;
 import _VisualDVM.Repository.Component.UI.ComponentsForm;
-import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable;
-import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspacesMenuBar;
-import _VisualDVM.Repository.Subscribes.SubscribersMenuBar;
-import _VisualDVM.Repository.Subscribes.SubsribersDBTable;
-import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
-import _VisualDVM.TestingSystem.Common.Group.GroupsMenuBar;
-import _VisualDVM.TestingSystem.Common.Test.TestDBTable;
-import _VisualDVM.TestingSystem.Common.Test.TestsMenuBar;
 import _VisualDVM.TestingSystem.Common.TestingBar;
-import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfigurationDBTable;
-import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfigurationsMenuBar;
-import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
-import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackagesBar;
-import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettingsDBTable;
-import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsBar;
-import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTasksBar;
-import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTasksSet;
-import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
-import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationsMenuBar;
-import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
-import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettingsBar;
-import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettingsDBTable;
-import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommandsBar;
-import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommandsDBTable;
-import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackagesBar;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
-import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsBar;
-import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
 import _VisualDVM.Visual.Interface.DebugWindow;
 import _VisualDVM.Visual.Interface.VersionsWindow;
 import _VisualDVM.Visual.Menus.CredentialsBar.CredentialsBar;
-import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar;
 import _VisualDVM.Visual.Menus.FileMenuBar.FileMenuBar;
 import _VisualDVM.Visual.Menus.MainMenuBar.MainMenuBar;
 import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
-import _VisualDVM.Visual.Menus.VariantsMenuBar.VariantsMenuBar;
 import _VisualDVM.Visual.Menus.VersionsMenuBar.VersionsMenuBar;
 import _VisualDVM.Visual.Windows.*;
 
diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.java b/src/_VisualDVM/Visual/Windows/CallbackForm.java
index 59aa6bcb..4ab4fa10 100644
--- a/src/_VisualDVM/Visual/Windows/CallbackForm.java
+++ b/src/_VisualDVM/Visual/Windows/CallbackForm.java
@@ -1,5 +1,6 @@
 package _VisualDVM.Visual.Windows;
 import Common.Utils.Utils_;
+import Common.Visual.Menus.VisualiserMenuBar;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.UI_;
 import _VisualDVM.Global;
@@ -14,7 +15,6 @@ import _VisualDVM.Visual.Interface.CallbackWindow;
 import _VisualDVM.Visual.Interface.CommentInterface;
 import _VisualDVM.Visual.Interface.DescriptionInterface;
 import _VisualDVM.Visual.Interface.FormWithSplitters;
-import Common.Visual.Menus.VisualiserMenuBar;
 import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
diff --git a/src/_VisualDVM/Visual/Windows/CommentFields.java b/src/_VisualDVM/Visual/Windows/CommentFields.java
index e22ecb32..1aa5a2d0 100644
--- a/src/_VisualDVM/Visual/Windows/CommentFields.java
+++ b/src/_VisualDVM/Visual/Windows/CommentFields.java
@@ -1,8 +1,8 @@
 package _VisualDVM.Visual.Windows;
+import Common.Visual.Menus.VisualiserMenuBar;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Visual.Interface.CommentInterface;
-import Common.Visual.Menus.VisualiserMenuBar;
 
 import javax.swing.*;
 public class CommentFields implements CommentInterface {
diff --git a/src/_VisualDVM/Visual/Windows/ComparisonForm.java b/src/_VisualDVM/Visual/Windows/ComparisonForm.java
index 77b8be70..2002a1f9 100644
--- a/src/_VisualDVM/Visual/Windows/ComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/ComparisonForm.java
@@ -5,12 +5,12 @@ import Common.Passes.Pass;
 import Common.Utils.TextLog;
 import Common.Utils.Utils_;
 import Common.Visual.Controls.ShortLabel;
+import Common.Visual.Menus.VisualiserMenuBar;
 import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Utils;
 import _VisualDVM.Visual.Editor.BaseEditor;
-import Common.Visual.Menus.VisualiserMenuBar;
 import _VisualDVM.Visual.UI;
 import javafx.util.Pair;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
diff --git a/src/_VisualDVM/Visual/Windows/DescriptionFields.java b/src/_VisualDVM/Visual/Windows/DescriptionFields.java
index 25c94a19..379bcbe8 100644
--- a/src/_VisualDVM/Visual/Windows/DescriptionFields.java
+++ b/src/_VisualDVM/Visual/Windows/DescriptionFields.java
@@ -1,8 +1,8 @@
 package _VisualDVM.Visual.Windows;
+import Common.Visual.Menus.VisualiserMenuBar;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Visual.Interface.DescriptionInterface;
-import Common.Visual.Menus.VisualiserMenuBar;
 
 import javax.swing.*;
 public class DescriptionFields implements DescriptionInterface {
diff --git a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
index 0bbc7542..778e0008 100644
--- a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
@@ -3,6 +3,7 @@ import Common.Database.Objects.DBObject;
 import Common.Passes.Pass;
 import Common.Utils.TextLog;
 import Common.Visual.Controls.ShortLabel;
+import Common.Visual.Menus.VisualiserMenuBar;
 import Common.Visual.UI_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
@@ -10,7 +11,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTasksPackageTree;
-import Common.Visual.Menus.VisualiserMenuBar;
 import _VisualDVM.Visual.UI;
 
 import javax.swing.*;