From 36c11ac93f3009726c58a6f3d9dd180ae3b70ed6 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 24 Oct 2024 23:40:24 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D1=81=D1=82=D0=B5=D0=BF=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BD=D0=BE=D0=B5=20=D0=B2=D1=8B=D0=B2=D0=B5=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=B0=D1=80=D0=BE=D0=B9=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=86=D0=B5=D0=BF=D1=86=D0=B8=D0=B8=20=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=83=D1=89=D0=B8=D1=85=20=D0=BE=D0=B1=D1=8A=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=82=D0=BE=D0=B2,=20=D0=BA=D0=B0=D1=81=D0=B0=D0=B5?=
 =?UTF-8?q?=D0=BC=D0=BE=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=87=D0=BD=D1=8B?=
 =?UTF-8?q?=D1=85=20=D0=BB=D1=83=D1=87=D1=88=D0=B5=20=D0=B4=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B6=D0=B0=D1=82=D1=8C=20=D0=B8=D1=85=20=D0=B2=20=D0=B8=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81=D0=B5=20=D1=82=D0=B0?=
 =?UTF-8?q?=D0=B1=D0=BB=D0=B8=D1=86,=20=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20?=
 =?UTF-8?q?=D0=BD=D0=B5=20=D0=BF=D0=B8=D1=81=D0=B0=D1=82=D1=8C=20=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BE=D0=B1=D1=8A?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=B0=20=D0=B4=D0=B2=D0=B0=D0=B6=D0=B4=D1=8B?=
 =?UTF-8?q?=20=D0=B8=20=D0=BD=D0=B5=20=D0=BC=D1=83=D1=87=D0=B8=D1=82=D1=8C?=
 =?UTF-8?q?=D1=81=D1=8F=20=D1=81=20=D1=82=D0=B8=D0=BF=D0=BE=D0=BC.=20?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B5=20=D1=84?=
 =?UTF-8?q?=D0=B8=D0=BA=D1=81=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 165 ++++++++++++++--
 .../Database/SQLITE/SQLiteDatabase.java       |  11 ++
 src/Common/Database/Tables/DataSet.java       |   4 +
 src/Common/Database/VisualiserDatabase.java   |   2 +
 src/Common/MainModule_.java                   |   4 +-
 src/Common/Passes/AddObjectPass.java          |   9 +-
 src/Common/Passes/DeleteObjectPass.java       |   2 +-
 src/Common/Passes/EditObjectPass.java         |   7 +-
 src/Common/Visual/ControlForm.java            |   2 +-
 src/Common/Visual/DataSetControlForm.java     |  63 ++++---
 src/_VisualDVM/Current.java                   | 111 +----------
 .../Compiler/UI/CompilerDialog.java           |   3 +-
 .../Compiler/UI/CompilerFields.java           |   3 +-
 .../GlobalData/Compiler/UI/CompilersForm.java |   8 +-
 .../Credentials/CredentialsDBTable.java       |   1 +
 .../DVMParameter/UI/DVMParameterDialog.java   |   7 +-
 .../DVMParameter/UI/DVMParametersForm.java    |   4 +-
 .../UI/EnvironmentValueDialog.java            |   7 +-
 .../UI/EnvironmentsValuesForm.java            |   8 +-
 src/_VisualDVM/GlobalData/GlobalDatabase.java |  45 +++--
 .../GlobalData/Machine/UI/MachinesForm.java   |   4 +-
 .../GlobalData/Makefile/UI/MakefilesForm.java |   7 +-
 .../Module/UI/ModuleAnchestorFields.java      |   4 +-
 .../Module/UI/ModuleAnchestorForm.java        |   4 +-
 .../GlobalData/Module/UI/ModulesForm.java     |   8 +-
 .../UI/RunConfigurationDialog.java            |   4 +-
 .../UI/RunConfigurationsForm.java             |   8 +-
 .../SapforProfile/UI/SapforProfilesForm.java  |   4 -
 .../UI/SapforProfileSettingsForm.java         |   9 +-
 .../UI/CompilationTasksForm.java              |  11 +-
 .../Tasks/RunTask/UI/RunTasksForm.java        |  16 +-
 .../Local/Linux/LinuxLocalRunSupervisor.java  |   5 +-
 .../Windows/WindowsLocalRunSupervisor.java    |   5 +-
 .../Supervisor/Remote/MVSRunSupervisor.java   |   5 +-
 .../Remote/ServerRunSupervisor.java           |   5 +-
 .../GlobalData/User/UI/UserDialog.java        |   6 +-
 .../GlobalData/User/UI/UsersForm.java         |   8 +-
 src/_VisualDVM/MainModule.java                | 177 +-----------------
 .../Passes/All/AbortDVMPackage.java           |   6 +-
 .../Passes/All/AbortSapforPackage.java        |   6 +-
 src/_VisualDVM/Passes/All/AddCompiler.java    |   2 +-
 .../Passes/All/AddDVMParameter.java           |   2 +-
 src/_VisualDVM/Passes/All/AddMakefile.java    |   2 +-
 .../Passes/All/AddRunConfiguration.java       |   2 +-
 src/_VisualDVM/Passes/All/AddUser.java        |   4 +-
 .../Passes/All/AppendBugReportField.java      |   7 +-
 .../Passes/All/ApplyBugReportSettings.java    |   4 +-
 src/_VisualDVM/Passes/All/ApplyProfile.java   |   5 +-
 src/_VisualDVM/Passes/All/BuildComponent.java |   2 +-
 src/_VisualDVM/Passes/All/CheckAccount.java   |   2 +-
 .../Passes/All/CheckRemoteWorkspace.java      |   7 +-
 .../Passes/All/CloneDVMSettings.java          |   4 +-
 .../Passes/All/CloneSapforSettings.java       |   4 +-
 .../Passes/All/CompareDVMRunTasks.java        |   4 +-
 .../Passes/All/CompareSapforPackages.java     |   4 +-
 src/_VisualDVM/Passes/All/Compile.java        |  35 +++-
 .../Passes/All/ConvertCorrectnessTests.java   |   5 +-
 .../Passes/All/CreateGroupFromDirectory.java  |   2 +-
 .../Passes/All/CreateGroupFromFiles.java      |   2 +-
 .../Passes/All/CreateTestFromDirectory.java   |   4 +-
 .../Passes/All/CreateTestFromProject.java     |   4 +-
 .../Passes/All/CreateTestsFromFiles.java      |   4 +-
 .../CreateTestsGroupFromSelectedVersions.java |   4 +-
 .../Passes/All/DownloadComponent.java         |   2 +-
 .../Passes/All/DownloadDVMPackage.java        |   4 +-
 .../Passes/All/DownloadTaskTest.java          |   5 +-
 src/_VisualDVM/Passes/All/DownloadTest.java   |   6 +-
 .../Passes/All/ExportDVMPackageToExcel.java   |   6 +-
 .../All/GetComponentsBackupsFromServer.java   |   8 +-
 src/_VisualDVM/Passes/All/InitialiseUser.java |  28 +--
 .../Passes/All/LocalInitaliseUser.java        |   4 +-
 .../Passes/All/OpenBugReportTestProject.java  |   4 +-
 .../Passes/All/PickCompilerEnvironments.java  |  11 +-
 .../PickCompilerEnvironmentsForTesting.java   |   2 +-
 .../Passes/All/PublishBugReport.java          |   7 +-
 .../Passes/All/PublishComponent.java          |   4 +-
 .../All/PublishSapforSettingsCommand.java     |   5 +-
 .../Passes/All/RemoteInitialiseUser.java      |   9 +-
 .../Passes/All/ReplaceTestProject.java        |   4 +-
 .../Passes/All/ReplaceTestsFromFiles.java     |   4 +-
 src/_VisualDVM/Passes/All/Run.java            |  30 ++-
 .../All/SPF_ModifyArrayDistribution.java      |   6 +-
 .../Passes/All/SaveBugReportExecutor.java     |   6 +-
 .../All/SaveCurrentDVMConfiguration.java      |   4 +-
 .../All/SaveCurrentSAPFORConfiguration.java   |   4 +-
 .../Passes/All/SelectRemoteFile.java          |   4 +-
 src/_VisualDVM/Passes/All/SendBugReport.java  |  14 +-
 .../Passes/All/ShowCompilerHelp.java          |   8 +-
 .../Passes/All/ShowCompilerVersion.java       |  11 +-
 .../Passes/All/ShowComponentChangesLog.java   |   4 +-
 .../All/ShowCurrentDVMConfigurationTests.java |   4 +-
 .../ShowCurrentSAPFORConfigurationTests.java  |   4 +-
 .../Passes/All/ShowMakefilePreview.java       |   6 +-
 .../Passes/All/ShowSapforCompilationErr.java  |   5 +-
 .../Passes/All/ShowSapforCompilationOut.java  |   5 +-
 .../All/StartSelectedDVMConfigurations.java   |  28 ++-
 .../StartSelectedSAPFORConfigurations.java    |   6 +-
 .../Passes/All/UpdateBugReportField.java      |   9 +-
 .../Passes/All/UpdateBugReportProgress.java   |   5 +-
 .../Passes/All/UpdateComponent.java           |  11 +-
 .../Passes/CurrentComponentPass.java          |   4 +-
 .../Passes/SSH/CurrentConnectionPass.java     |  10 +-
 .../Passes/Server/CloneServerObject.java      |   7 +-
 .../Passes/Server/DeleteServerObject.java     |   2 +-
 .../Passes/Server/EditServerObject.java       |   2 +-
 .../Passes/Testing/AbortTestingPackage.java   |   7 +-
 .../Testing/ActualizeTestingPackages.java     |   2 +-
 .../Testing/SaveCurrentConfiguration.java     |   7 +-
 .../ShowCurrentConfigurationTests.java        |   7 +-
 .../ProjectData/DBArray/UI/DBArraysForm.java  |   4 +-
 .../Messages/Errors/ErrorsDBTable.java        |   9 -
 .../Messages/MessagesControlForm.java         |   4 +
 .../ProjectData/Messages/MessagesDBTable.java |   8 +
 .../Messages/Notes/NotesDBTable.java          |   9 -
 .../UI/RecommendationsForm.java               |   4 +-
 .../Messages/Warnings/WarningsDBTable.java    |   9 -
 .../ProjectData/Project/db_project_info.java  |   3 +-
 .../Arrays/UI/ProjectArraysForm.java          |   5 +-
 .../SapforData/Arrays/UI/RulesTree.java       |   5 +-
 .../Regions/UI/ArrayAlignmentBar.java         |   7 +-
 .../Regions/UI/ParallelRegionsForm.java       |   4 +-
 .../Variants/UI/ParallelVariantsForm.java     |   5 +-
 .../BugReport/UI/BugReportsForm.java          |   4 +-
 .../Repository/Component/ComponentsSet.java   |   5 +-
 .../Component/UI/ComponentsForm.java          |   4 +-
 .../UI/SubscriberWorkspacesForm.java          |  11 +-
 .../Subscribes/UI/SubsribersForm.java         |   6 +-
 .../Common/Group/UI/GroupsForm.java           |   5 +-
 .../Common/Test/UI/TestDialog.java            |   7 +-
 .../Common/Test/UI/TestsForm.java             |  11 +-
 .../UI/DVMConfigurationsForm.java             |   4 +-
 .../DVM/DVMPackage/UI/DVMPackagesForm.java    |   4 +-
 .../DVM/DVMSettings/UI/DVMSettingsFields.java |   6 +-
 .../DVM/DVMSettings/UI/DVMSettingsForm.java   |   5 +-
 .../DVM/DVMTasks/UI/DVMRunTasksForm.java      |   4 +-
 .../UI/SapforConfigurationsForm.java          |   4 +-
 .../SapforPackage/UI/SapforPackagesForm.java  |   4 +-
 .../SapforSettings/UI/SapforSettingsForm.java |   4 +-
 .../UI/SapforSettingsCommandDialog.java       |   3 +-
 .../UI/SapforSettingsCommandsForm.java        |   9 +-
 .../ServerSapfor/UI/ServerSapforsForm.java    |   4 +-
 .../CredentialsBar/CredentialsMenuBar.java    |   9 +-
 .../Visual/Windows/CallbackForm.java          |  20 +-
 .../Visual/Windows/ComparisonForm.java        |  24 +--
 .../CompilationTasksComparisonForm.java       |   6 +-
 .../Windows/DVMRunTasksComparisonForm.java    |   6 +-
 .../Visual/Windows/ProjectForm.java           |   2 +-
 .../Windows/RunTasksComparisonForm.java       |   6 +-
 .../Windows/SapforPackagesComparisonForm.java |   4 +-
 .../Windows/SapforVersionsComparisonForm.java |   9 +-
 .../Visual/Windows/TestingForm.java           |  13 +-
 .../Visual/Windows/VariantsForm.java          |   2 +-
 .../Windows/VersionsComparisonForm.java       |   5 +-
 153 files changed, 765 insertions(+), 739 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bdc4ba14..cd1725c4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,23 +7,160 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <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/Passes/All/AddBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddBugReport.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CopyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CopyProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateEmptyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateEmptyProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" 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/Database/VisualiserDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/VisualiserDatabase.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/Passes/AddObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/AddObjectPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/ControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/ControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Current.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilerDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilerDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Credentials/CredentialsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Credentials/CredentialsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParameterDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParameterDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentValueDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentValueDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UserDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UserDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.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/Passes/All/AbortDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AbortDVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AbortSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AbortSapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddCompiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddCompiler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddDVMParameter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddDVMParameter.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddMakefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddMakefile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddRunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddRunConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyProfile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/BuildComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/BuildComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloneDVMSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloneDVMSettings.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloneSapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloneSapforSettings.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareSapforPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareSapforPackages.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Compile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Compile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetOldBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetOldBugReports.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/InitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/InitialiseUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/LocalInitaliseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/LocalInitaliseUser.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponentsServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishTestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveGraph.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveGraph.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PickCompilerEnvironments.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PickCompilerEnvironments.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishSapforSettingsCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishSapforSettingsCommand.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RemoteInitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RemoteInitialiseUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Run.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Run.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveCurrentDVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveCurrentDVMConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveCurrentSAPFORConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveCurrentSAPFORConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SelectRemoteFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SelectRemoteFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerHelp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerHelp.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerVersion.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowMakefilePreview.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowMakefilePreview.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportProgress.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportProgress.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/CurrentComponentPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/CurrentComponentPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/CurrentConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/CurrentConnectionPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Notes/NotesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Notes/NotesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.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/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsMenuBar.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/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CompilationTasksComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CompilationTasksComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DVMRunTasksComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DVMRunTasksComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/RunTasksComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/RunTasksComparisonForm.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" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VariantsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Database/SQLITE/SQLiteDatabase.java b/src/Common/Database/SQLITE/SQLiteDatabase.java
index e19c550f..daa60eec 100644
--- a/src/Common/Database/SQLITE/SQLiteDatabase.java
+++ b/src/Common/Database/SQLITE/SQLiteDatabase.java
@@ -4,6 +4,7 @@ import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DBTable;
 import Common.Database.Tables.DBTableColumn;
 import Common.Passes.PassException;
+import Common.Utils.TextLog;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
 import javafx.util.Pair;
@@ -255,4 +256,14 @@ public abstract class SQLiteDatabase extends Database {
     }
     //--
     //https://stackoverflow.com/questions/8558099/sqlite-query-with-byte-where-clause
+    //получение "текущих" объектов. скорее временная мера.
+    public boolean Check(TextLog log, Class... tablesClasses) {
+        for (Class tableClass : tablesClasses) {
+            getTable(tableClass).getUI().Check(log);
+        }
+        return log.isEmpty();
+    }
+    public boolean matchCurrentID(Class tableClass, int id_in) {
+        return getTable(tableClass).getUI().matchCurrentID(id_in);
+    }
 }
\ No newline at end of file
diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java
index 3da53482..9b9974e2 100644
--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -64,6 +64,10 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
             ui.Show(key);
         }
     }
+    public void RefreshUI(){
+        if ((ui != null) && ui.isShown())
+            ui.RedrawControl();
+    }
     //СОДЕРЖИМОЕ
     public D getFirstRecord() {
         return Data.values().stream().findFirst().orElse(null);
diff --git a/src/Common/Database/VisualiserDatabase.java b/src/Common/Database/VisualiserDatabase.java
index 7551fe53..19f4fae6 100644
--- a/src/Common/Database/VisualiserDatabase.java
+++ b/src/Common/Database/VisualiserDatabase.java
@@ -5,6 +5,7 @@ import Common.Database.Objects.PassStats.PassStatsDBTable;
 import Common.Database.Objects.Splitter.SplittersDBTable;
 import Common.Database.SQLITE.SQLiteDatabase;
 import Common.Passes.PassCode_;
+import Common.Utils.TextLog;
 
 import java.io.File;
 public class VisualiserDatabase extends SQLiteDatabase {
@@ -26,4 +27,5 @@ public class VisualiserDatabase extends SQLiteDatabase {
     public PassCode_ getSynchronizePassCode() {
         return null;
     }
+
 }
diff --git a/src/Common/MainModule_.java b/src/Common/MainModule_.java
index 5c51c956..171a3959 100644
--- a/src/Common/MainModule_.java
+++ b/src/Common/MainModule_.java
@@ -17,7 +17,7 @@ public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModu
     //--
     D db = null;
     Class<D> db_class = null;
-    LinkedHashMap<Current_, Object> objects = null;  //Current
+    LinkedHashMap<Current_, Object> objects = null;  //Current/ большинство выведено
     //--
     LinkedHashMap<PassCode_, Pass> passes = null;
     //--
@@ -87,9 +87,11 @@ public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModu
                 Log.Writeln_(name.getDescription() + " не выбран(а)");
         return Log.isEmpty();
     }
+    /*
     public boolean matchCurrentID(Current_ name, int id) {
         return (get(name) != null) && (((iDBObject) get(name)).id == id);
     }
+     */
     //ПРОХОДЫ
     public abstract Class getPassCodesEnum();
     public abstract String getAllPassesClassPrefix();
diff --git a/src/Common/Passes/AddObjectPass.java b/src/Common/Passes/AddObjectPass.java
index 175f2323..18338330 100644
--- a/src/Common/Passes/AddObjectPass.java
+++ b/src/Common/Passes/AddObjectPass.java
@@ -4,9 +4,12 @@ public abstract class AddObjectPass<D extends DBObject> extends ObjectPass<D> {
     public AddObjectPass(Class<D> d_in) {
         super(d_in);
     }
-    public Class<? extends DBObject> getOwner() {
+    protected Class<? extends DBObject> getOwnerClass() {
         return null;
     }
+    protected DBObject getOwner() {
+        return getDb().getTable(getOwnerClass()).getUI().getCurrent();
+    }
     @Override
     public String getDescription_() {
         return "добавление";
@@ -14,9 +17,7 @@ public abstract class AddObjectPass<D extends DBObject> extends ObjectPass<D> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = d.newInstance();
-        return
-                ((getOwner() == null) || (getDb().getTable(getOwner()).getUI().CheckCurrent(Log))) &&
-                        fillObjectFields();
+        return ((getOwnerClass() == null) || (getDb().getTable(getOwnerClass()).getUI().Check(Log))) && fillObjectFields();
     }
     protected boolean fillObjectFields() throws Exception {
         return getTable().getUI().ShowAddObjectDialog(target);
diff --git a/src/Common/Passes/DeleteObjectPass.java b/src/Common/Passes/DeleteObjectPass.java
index 05bb77dc..0753d833 100644
--- a/src/Common/Passes/DeleteObjectPass.java
+++ b/src/Common/Passes/DeleteObjectPass.java
@@ -15,7 +15,7 @@ public abstract class DeleteObjectPass<D extends DBObject> extends ObjectPass<D>
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = (D) getTable().getUI().getCurrent();
-        return getTable().getUI().CheckCurrent(Log) && getTable().getUI().ShowDeleteObjectDialog(target);
+        return getTable().getUI().Check(Log) && getTable().getUI().ShowDeleteObjectDialog(target);
     }
     //Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
     @Override
diff --git a/src/Common/Passes/EditObjectPass.java b/src/Common/Passes/EditObjectPass.java
index 0bbec836..3847920d 100644
--- a/src/Common/Passes/EditObjectPass.java
+++ b/src/Common/Passes/EditObjectPass.java
@@ -14,7 +14,7 @@ public abstract class EditObjectPass<D extends DBObject> extends ObjectPass<D> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = (D) getTable().getUI().getCurrent();
-        return getTable().getUI().CheckCurrent(Log) && getTable().getUI().ShowEditObjectDialog(target);
+        return getTable().getUI().Check(Log) && getTable().getUI().ShowEditObjectDialog(target);
     }
     @Override
     protected void body() throws Exception {
@@ -23,7 +23,8 @@ public abstract class EditObjectPass<D extends DBObject> extends ObjectPass<D> {
     @Override
     protected void showFinish() throws Exception {
         getTable().ShowUI(target.getPK());
-        for (Class dep : getTable().getFKDependencies().keySet())
-            getDb().getTable(dep).getUI().Refresh();
+        for (Class dep : getTable().getFKDependencies().keySet()) {
+            getDb().getTable(dep).RefreshUI();
+        }
     }
 }
diff --git a/src/Common/Visual/ControlForm.java b/src/Common/Visual/ControlForm.java
index 839d73bc..bd6ca9df 100644
--- a/src/Common/Visual/ControlForm.java
+++ b/src/Common/Visual/ControlForm.java
@@ -47,7 +47,7 @@ public class ControlForm<C extends Component> {
         UI.Clear(scrollPanel);
         control = null; //очищено.
     }
-    public void Refresh() {
+    public void RedrawControl() {
         if (control != null)
             redrawControl();
     }
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index b867d5d6..6c2b0951 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -1,6 +1,5 @@
 package Common.Visual;
 import Common.CommonConstants;
-import Common.Current_;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.Grid.TableVisualData;
 import Common.Database.Tables.DBTable;
@@ -29,6 +28,7 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTable> {
     protected DataSet<?, D> dataSource; //источник данных
+    protected D current = null; //заменить все обращения к мейн модулю.
     protected DataMenuBar bar = null; //верхняя панель меню
     protected int current_row_i; //индекс текущей строки.
     protected boolean events_on = true;
@@ -99,15 +99,15 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
     void SaveColumns() {
         if (MainModule_.instance.getDb() != null) {
             try {
-                if (CurrentName() != null) {
-                    String tableName = CurrentName().toString();
+                if (needsCurrent()) {
                     Vector<String> widths = IntStream.range(0, columns.size()).mapToObj(i -> String.valueOf(control.getColumnModel().getColumn(i).getWidth())).collect(Collectors.toCollection(Vector::new));
                     String packed = String.join("|", widths);
                     TableVisualData tableVisualData;
-                    if (MainModule_.instance.getDb().tablesVisualData.containsKey(tableName)) {
-                        tableVisualData = MainModule_.instance.getDb().tablesVisualData.get(tableName);
+                    //todo метод сохрания к бд отнести, как с окнами и проходами. (?)
+                    if (MainModule_.instance.getDb().tablesVisualData.containsKey(getCurrentName())) {
+                        tableVisualData = MainModule_.instance.getDb().tablesVisualData.get(getCurrentName());
                     } else {
-                        tableVisualData = new TableVisualData(tableName);
+                        tableVisualData = new TableVisualData(getCurrentName());
                         MainModule_.instance.getDb().Insert(tableVisualData);
                     }
                     tableVisualData.sizes = packed;
@@ -202,10 +202,10 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
             @Override
             public void CorrectColumnsSizes() {
                 if ((MainModule_.instance.getDb() != null)
-                        && CurrentName() != null
-                        && MainModule_.instance.getDb().tablesVisualData.containsKey(CurrentName().toString())) {
+                        && needsCurrent()
+                        && MainModule_.instance.getDb().tablesVisualData.containsKey(getCurrentName())) {
                     if (!getColumnsProfile().equalsIgnoreCase(colNamesAndSizes)) {
-                        TableVisualData grid = MainModule_.instance.getDb().tablesVisualData.get(CurrentName().toString());
+                        TableVisualData grid = MainModule_.instance.getDb().tablesVisualData.get(getCurrentName());
                         String[] data = grid.sizes.split("\\|");
                         for (int i = 0; i < columns.size(); ++i) {
                             if (i <= (data.length - 1)) {
@@ -261,7 +261,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
                 //------------------------->>
             }
         };
-        if (CurrentName() != null) {
+        if (needsCurrent()) {
             current_row_i = CommonConstants.Nan;
             ListSelectionModel selModel = control.getSelectionModel();
             selModel.addListSelectionListener(e -> {
@@ -269,7 +269,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
                 if ((row >= 0)) {
                     if (row != current_row_i) {
                         current_row_i = row;
-                        MainModule_.instance.set(CurrentName(), control.getRowObject(row));
+                        setCurrent((D) control.getRowObject(row));
                         if (events_on) {
                             try {
                                 ShowCurrentObject();
@@ -390,12 +390,8 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
     protected boolean hasMenuBar() {
         return true;
     }
-    //-
-    protected Current_ CurrentName() {
-        return null;
-    }
-    void dropCurrent() {
-        MainModule_.instance.set(CurrentName(), null);
+    public void dropCurrent() {
+        current = null;
     }
     @SuppressWarnings("unchecked")
     protected DBObjectDialog getDialog() {
@@ -428,7 +424,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
     public void SaveLastCurrent() {
         savedCurrentKey = null;
         savedSelectedKeys.clear();
-        if ((CurrentName() != null) && (getCurrent() != null)) {
+        if (needsCurrent() && (getCurrent() != null)) {
             savedCurrentKey = getCurrent().getPK();
         }
         savedSelectedKeys = getSelectedKeys();
@@ -454,26 +450,43 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
     public Vector<Object> getSelectedKeys() {
         return dataSource.Data.values().stream().filter(DBObject::isSelected).map(d -> d.getPK()).collect(Collectors.toCollection(Vector::new));
     }
-    public boolean CheckCurrent(TextLog log) {
-        return MainModule_.instance.Check(log, CurrentName());
+    //переименовать в CheckCurrent
+    public boolean Check(TextLog log) {
+        if (current == null) {
+            log.Writeln_(dataSource.getSingleDescription() + " не выбран(а)");
+            return false;
+        }
+        return true;
+    }
+    public boolean matchCurrentID(int id_in) {
+        return (current != null) && (((int) current.getPK()) == id_in);
     }
     public boolean CheckSelectedOrCurrent(TextLog log) {
-        if ((getSelectedCount() == 0) && (CurrentName() == null || (getCurrent() == null))) {
+        if ((getSelectedCount() == 0) && (!needsCurrent() || (getCurrent() == null))) {
             log.Writeln_(dataSource.getPluralDescription() + ":");
             log.Writeln_("Отсутствуют отмеченные объекты, или текущий объект!");
             return false;
         }
         return true;
     }
+    protected boolean needsCurrent() {
+        return false;
+    } //нужно ли отслеживать текущий объект.
+    protected String getCurrentName() {
+        return dataSource.d.getSimpleName();
+    }
     public D getCurrent() {
-        return (D) MainModule_.instance.get(CurrentName());
+        return current;
+    }
+    public D setCurrent(D object) {
+        return current = object;
     }
     public Vector<D> getSelectedOrCurrent() {
         Vector<D> res = new Vector<>();
         if (getSelectedCount() > 0)
             res = getSelectedItems();
         else {
-            if ((CurrentName() != null) && (getCurrent() != null)) {
+            if (needsCurrent() && (getCurrent() != null)) {
                 res.add(getCurrent());
             }
         }
@@ -484,7 +497,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
         if (getSelectedCount() > 0)
             res = getSelectedKeys();
         else {
-            if ((CurrentName() != null) && (getCurrent() != null)) {
+            if (needsCurrent() && (getCurrent() != null)) {
                 res.add(getCurrent().getPK());
             }
         }
@@ -502,7 +515,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
             if (isObjectVisible(object))
                 object.Select(flag);
         }
-        Refresh();
+        RedrawControl();
     }
     //ДИАЛОГИ
     public boolean ShowAddObjectDialog(D object) {
diff --git a/src/_VisualDVM/Current.java b/src/_VisualDVM/Current.java
index 67ce5ed3..6ccea4bd 100644
--- a/src/_VisualDVM/Current.java
+++ b/src/_VisualDVM/Current.java
@@ -1,39 +1,20 @@
 package _VisualDVM;
 import Common.Current_;
 public enum Current implements Current_ {
+    Account, //нет формы таблиц.
     //--
-    DVMPackage,
-    SapforPackage,
-    //--
-    ServerSapfor,
     SapforEtalonVersion,
     SapforVersion,
     //--
     ComponentServerBackup,
-    Subscriber,
     FileGraphElement,
     InlineGraphElement,
     InlineGraphElement2,
     IncludeGraphElement,
-    Component,
     Project,
     File,
     Root,
     Version,
-    BugReport,
-    Account,
-    DBArray,
-    ProjectArray,
-    ParallelRegionInfo,
-    ParallelVariant,
-    Machine,
-    User,
-    Compiler,
-    Makefile,
-    Module,
-    RunConfiguration,
-    EnvironmentValue,
-    CompilationTask,
     RunTask,
     ProjectNode, //узел в дереве проекта. нужен для отображения добавленных файлов
     SelectedDirectory,
@@ -42,120 +23,42 @@ public enum Current implements Current_ {
     RemoteFile,
     RunStsRecord,
     //только для того, чтобы закодировать таблицу.
-    Array,
-    ParallelRegion,
-    Dimensions,
-    //----------
-    Warnings,
-    Errors,
-    Notes,
-    Recommendations,
     //-
     Sapfor,
     //-
-    Scenario,
-    ScenarioCommand,
-    //-
-    DVMConfiguration,
-    Group,
-    //-
-    DVMParameterValue,
-    Test,
     Function,
     SelectedFunction,
     //-
-    Credentials,
-    //-
     PackageVersion,
-    SapforConfiguration,
-    SapforProfile,
-    SapforProfileSetting,
     //--
-    ProjectView,
-    SubscriberWorkspace,
-    DVMRunTask,
-    SapforSettings,
-    SapforSettingsCommand,
-    DVMSettings;
+    ProjectView, Credentials;
     @Override
     public String getDescription() {
         switch (this) {
-            case DVMSettings:
-                return "Параметры тестирования DVM системы";
-            case SapforSettings:
-                return "Параметры тестирования системы SAPFOR";
-            case SapforSettingsCommand:
-                return "Команда SAPFOR";
-            case DVMRunTask:
-                return "Задача DVM тестирования";
-            case SapforPackage:
-                return "Пакет тестирования SAPFOR";
-            case DVMPackage:
-                return "Пакет тестирования DVM";
-            case DVMConfiguration:
-                return "Конфигурация тестирования";
-            case ServerSapfor:
-                return "тестовая версия SAPFOR";
-            case SubscriberWorkspace:
-                return "рабочее пространство пользователя";
-            case SapforProfile:
-                return "Профиль SAPFOR";
-            case SapforProfileSetting:
-                return "Настройка профиля SAPFOR";
             case SapforEtalonVersion:
                 return "Версия SAPFOR(Эталон)";
             case SapforVersion:
                 return "Версия SAPFOR";
             case ComponentServerBackup:
                 return "Версия компонента для восстановления с сервера";
-            case Subscriber:
-                return "Адресат";
             case SelectedFunction:
                 return "Выбранный узел графа процедур";
-            case SapforConfiguration:
-                return "Конфигурация тестирования SAPFOR";
             case PackageVersion:
                 return "Версия пакетного режима";
-            case Credentials:
-                return "Учётные данные";
             case Function:
                 return "Функция";
-            case DVMParameterValue:
-                return "Параметр DVM системы";
-            case ParallelRegion:
-                return "Область распараллеливания";
-            case Group:
-                return "Группа тестов DVM";
-            case Scenario:
-                return "Сценарий";
-            case ScenarioCommand:
-                return "Команда сценария";
             case ProjectNode:
                 return "текущий узел дерева проектов"; //служебка
-            case Test:
-                return "Тест";
             case Sapfor:
                 return "SAPFOR";
-            case EnvironmentValue:
-                return "Значение переменной окружения";
             case SelectedDirectory:
                 return "Папка проекта";
             case SelectedFile:
                 return "Файл проекта";
-            case RunConfiguration:
-                return "Конфигурация запуска";
             case RunTask:
                 return "Задача на запуск";
-            case CompilationTask:
-                return "Задача на компиляцию";
-            case Makefile:
-                return "Мейкфайл";
-            case Module:
-                return "Языковой модуль мейкфайла";
             case RemoteFile:
                 return "Удалённый файл";
-            case Component:
-                return "Компонент";
             case Project:
                 return "Проект";
             case File:
@@ -164,16 +67,6 @@ public enum Current implements Current_ {
                 return "Корень дерева версий";
             case Version:
                 return "Версия";
-            case BugReport:
-                return "Отчёт об ошибке";
-            case Account:
-                return "Аккаунт";
-            case Machine:
-                return "Машина";
-            case User:
-                return "Пользователь";
-            case Compiler:
-                return "Компилятор";
             default:
                 return "";
         }
diff --git a/src/_VisualDVM/GlobalData/Compiler/UI/CompilerDialog.java b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerDialog.java
index 72c0ec66..4ea797c7 100644
--- a/src/_VisualDVM/GlobalData/Compiler/UI/CompilerDialog.java
+++ b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerDialog.java
@@ -5,6 +5,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.Compiler.CompilerType;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.Utils;
 import _VisualDVM.Validators.PathValidator;
 public class CompilerDialog extends DBObjectDialog<Compiler, CompilerFields> {
@@ -75,7 +76,7 @@ public class CompilerDialog extends DBObjectDialog<Compiler, CompilerFields> {
     }
     @Override
     public void ProcessResult() {
-        Result.machine_id = Global.mainModule.getMachine().id;
+        Result.machine_id = Global.mainModule.getDb().getTable(Machine.class).getUI().getCurrent().id;
         Result.description = fields.tfDescription.getText();
         Result.call_command = fields.tfCallCommand.getText();
         Result.help_command = fields.tfHelpCommand.getText();
diff --git a/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java
index befa0719..89141034 100644
--- a/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java
+++ b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java
@@ -5,6 +5,7 @@ import Common.Visual.Windows.Dialog.DialogFields;
 import Common.Visual.Windows.Dialog.VDirectoryChooser;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.CompilerType;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Machine.MachineType;
 import _VisualDVM.Passes.PassCode;
 
@@ -30,7 +31,7 @@ public class CompilerFields implements DialogFields {
             CompilerType type = (CompilerType) cbCompilerType.getSelectedItem();
             if (type == CompilerType.dvm) {
                 String dst = null;
-                if (Global.mainModule.getMachine().type.equals(MachineType.Local)) {
+                if (Global.mainModule.getDb().getTable(Machine.class).getUI().getCurrent().type.equals(MachineType.Local)) {
                     File file = directoryChooser.ShowDialog();
                     if (file != null)
                         dst = file.getAbsolutePath();
diff --git a/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java b/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
index e6a39520..8f3c3b93 100644
--- a/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
+++ b/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
@@ -7,6 +7,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.Compiler;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
@@ -15,8 +16,8 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.Compiler;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
@@ -68,7 +69,8 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
     }
     @Override
     public boolean isObjectVisible(Compiler object) {
-        return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
+        return super.isObjectVisible(object) &&
+                Global.mainModule.getDb().getTable(Machine.class).getUI().matchCurrentID(object.machine_id);
     }
     @Override
     protected DBObjectDialog getDialog() {
diff --git a/src/_VisualDVM/GlobalData/Credentials/CredentialsDBTable.java b/src/_VisualDVM/GlobalData/Credentials/CredentialsDBTable.java
index 62fcd886..e5b5f4eb 100644
--- a/src/_VisualDVM/GlobalData/Credentials/CredentialsDBTable.java
+++ b/src/_VisualDVM/GlobalData/Credentials/CredentialsDBTable.java
@@ -1,5 +1,6 @@
 package _VisualDVM.GlobalData.Credentials;
 import Common.Database.Tables.iDBTable;
+//todo реализовать стандартно для выбранных объектов (?)
 public class CredentialsDBTable extends iDBTable<Credentials> {
     public CredentialsDBTable() {
         super(Credentials.class);
diff --git a/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParameterDialog.java b/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParameterDialog.java
index bfb06a99..a3234935 100644
--- a/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParameterDialog.java
+++ b/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParameterDialog.java
@@ -1,9 +1,12 @@
 package _VisualDVM.GlobalData.DVMParameter.UI;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
+import _VisualDVM.GlobalData.Machine.Machine;
+import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import _VisualDVM.Utils;
 public class DVMParameterDialog extends DBObjectDialog<DVMParameter, DVMParameterFields> {
     public DVMParameterDialog() {
@@ -45,8 +48,8 @@ public class DVMParameterDialog extends DBObjectDialog<DVMParameter, DVMParamete
     }
     @Override
     public void ProcessResult() {
-        Result.machine_id = Global.mainModule.getMachine().id;
-        Result.run_configuration_id = Global.mainModule.getRunConfiguration().id;
+        Result.machine_id = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().id;
+        Result.run_configuration_id = MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().getCurrent().id;
         Result.name = (String) fields.cbName.getSelectedItem();
         Result.value = fields.tfValue.getText();
     }
diff --git a/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java b/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java
index 31415116..653d2fee 100644
--- a/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java
+++ b/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java
@@ -14,8 +14,8 @@ public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.DVMParameterValue;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     public String[] getUIColumnNames() {
diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentValueDialog.java b/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentValueDialog.java
index c666839c..fd979d4b 100644
--- a/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentValueDialog.java
+++ b/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentValueDialog.java
@@ -1,9 +1,12 @@
 package _VisualDVM.GlobalData.EnvironmentValue.UI;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
+import _VisualDVM.GlobalData.Machine.Machine;
+import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import _VisualDVM.Utils;
 public class EnvironmentValueDialog extends DBObjectDialog<EnvironmentValue, EnvironmentValueFields> {
     public EnvironmentValueDialog() {
@@ -40,8 +43,8 @@ public class EnvironmentValueDialog extends DBObjectDialog<EnvironmentValue, Env
     }
     @Override
     public void ProcessResult() {
-        Result.machine_id = Global.mainModule.getMachine().id;
-        Result.run_configuration_id = Global.mainModule.getRunConfiguration().id;
+        Result.machine_id = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().id;
+        Result.run_configuration_id = MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().getCurrent().id;
         Result.name = (String) fields.cbName.getSelectedItem();
         Result.value = fields.tfValue.getText();
     }
diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java b/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
index c8a93880..cccfb204 100644
--- a/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
+++ b/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
@@ -7,6 +7,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
+import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
@@ -15,8 +16,8 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.EnvironmentValue;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     public String[] getUIColumnNames() {
@@ -48,7 +49,8 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
     }
     @Override
     public boolean isObjectVisible(EnvironmentValue object) {
-        return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id);
+        return super.isObjectVisible(object) &&
+                MainModule_.instance.getDb().matchCurrentID(RunConfiguration.class,object.run_configuration_id );
     }
     @Override
     protected DBObjectDialog<EnvironmentValue, ? extends DialogFields> getDialog() {
diff --git a/src/_VisualDVM/GlobalData/GlobalDatabase.java b/src/_VisualDVM/GlobalData/GlobalDatabase.java
index 798b6c78..ea3de092 100644
--- a/src/_VisualDVM/GlobalData/GlobalDatabase.java
+++ b/src/_VisualDVM/GlobalData/GlobalDatabase.java
@@ -6,15 +6,19 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Account.Account;
 import _VisualDVM.GlobalData.Account.AccountsDBTable;
+import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.Compiler.CompilersDBTable;
 import _VisualDVM.GlobalData.Credentials.Credentials;
 import _VisualDVM.GlobalData.Credentials.CredentialsDBTable;
 import _VisualDVM.GlobalData.DBLastProject.LastProjectsDBTable;
 import _VisualDVM.GlobalData.DVMParameter.DVMParameterDBTable;
 import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Machine.MachinesDBTable;
+import _VisualDVM.GlobalData.Makefile.Makefile;
 import _VisualDVM.GlobalData.Makefile.MakefilesDBTable;
 import _VisualDVM.GlobalData.Module.ModulesDBTable;
+import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import _VisualDVM.GlobalData.RunConfiguration.RunConfigurationsDBTable;
 import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
 import _VisualDVM.GlobalData.SapforProfile.SapforProfilesDBTable;
@@ -25,6 +29,7 @@ import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.GlobalData.Settings.SettingsDBTable;
 import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTasksDBTable;
+import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.GlobalData.User.UsersDBTable;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.Component.ComponentType;
@@ -97,30 +102,46 @@ public class GlobalDatabase extends VisualiserDatabase {
     public PassCode getSynchronizePassCode() {
         return null;
     }
+
+    //todo централизованное сохранение текущих объектов в базах
+
     public void SaveCredentials() {
+        /*
         try {
-            Credentials credentials = Global.mainModule.getCredentials();
-            if (Global.mainModule.HasMachine())
-                credentials.machine_id = Global.mainModule.getMachine().id;
-            if (Global.mainModule.HasUser())
-                credentials.user_id = Global.mainModule.getUser().id;
-            if (Global.mainModule.HasCompiler())
-                credentials.compiler_id = Global.mainModule.getCompiler().id;
-            if (Global.mainModule.HasMakefile())
-                credentials.makefile_id = Global.mainModule.getMakefile().id;
-            if (Global.mainModule.HasRunConfiguration())
-                credentials.runconfiguration_id = Global.mainModule.getRunConfiguration().id;
+
+
+            Credentials credentials = MainModule_.instance.getDb().getTable(Credentials.class).getUI().getCurrent();
+            if (MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent()!=null)
+                credentials.machine_id = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().id;
+
+            if (MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent()!=null)
+                credentials.user_id = MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent().id;
+
+            if (MainModule_.instance.getDb().getTable(Compiler.class).getUI().getCurrent()!=null)
+                credentials.compiler_id = MainModule_.instance.getDb().getTable(Compiler.class).getUI().getCurrent().id;
+
+            if (MainModule_.instance.getDb().getTable(Makefile.class).getUI().getCurrent()!=null)
+                credentials.makefile_id =MainModule_.instance.getDb().getTable(Makefile.class).getUI().getCurrent().id;
+
+            if (MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().getCurrent()!=null)
+                credentials.runconfiguration_id = MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().getCurrent().id;
             Update(credentials);
         } catch (Exception ex) {
             ex.printStackTrace();
         }
+         */
+
     }
+
     public void UpdateCredentials() {
+            /*
+        }
         try {
-            Update(Global.mainModule.getCredentials());
+            Update(MainModule_.instance.getDb().getTable(Credentials.class).getUI().getCurrent());
         } catch (Exception ex) {
             Utils_.MainLog.PrintException(ex);
         }
+             */
     }
     //--
     public LinkedHashMap<SettingName, String> getSapforSettingsForProfile() {
diff --git a/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java b/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
index 9b5ed720..c6712b60 100644
--- a/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
+++ b/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
@@ -18,8 +18,8 @@ public class MachinesForm extends DataSetControlForm<Machine> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.Machine;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
diff --git a/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java b/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
index f72d9731..643b8f1d 100644
--- a/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
+++ b/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
@@ -5,6 +5,7 @@ import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Makefile.Makefile;
 import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorFields;
 import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
@@ -16,8 +17,8 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.Makefile;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
@@ -64,7 +65,7 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
     @Override
     public boolean isObjectVisible(Makefile object) {
         return super.isObjectVisible(object) &&
-                MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
+                MainModule_.instance.getDb().getTable(Machine.class).getUI().matchCurrentID(object.machine_id);
     }
     @Override
     protected DBObjectDialog<Makefile, ModuleAnchestorFields> getDialog() {
diff --git a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java
index a1e194c9..d6b19d9d 100644
--- a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java
+++ b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java
@@ -1,10 +1,12 @@
 package _VisualDVM.GlobalData.Module.UI;
+import Common.MainModule_;
 import Common.Passes.Pass;
 import Common.Visual.Controls.StyledTextComboBox;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.Compiler;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Makefile.Makefile;
 import _VisualDVM.GlobalData.Module.Module;
 import _VisualDVM.GlobalData.Module.ModuleAnchestor;
@@ -27,7 +29,7 @@ public class ModuleAnchestorFields implements DialogFields {
     //считаем что машина есть.
     public ModuleAnchestorFields() {
         //-
-        LinkedHashMap<Integer, Compiler> compilers = Global.mainModule.getMachine().getCompilers();
+        LinkedHashMap<Integer, Compiler> compilers = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().getCompilers();
         compilers.values().forEach(compiler -> cbCompilers.addItem(compiler));
         bHelp.addActionListener(e -> {
             if (cbCompilers.getSelectedItem() != null) {
diff --git a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java
index 3139475b..738518bb 100644
--- a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java
+++ b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java
@@ -1,10 +1,12 @@
 package _VisualDVM.GlobalData.Module.UI;
 import Common.CommonConstants;
+import Common.MainModule_;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.Compiler.CompilerType;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Makefile.Makefile;
 import _VisualDVM.GlobalData.Module.Module;
 import _VisualDVM.GlobalData.Module.ModuleAnchestor;
@@ -101,7 +103,7 @@ public class ModuleAnchestorForm<T extends ModuleAnchestor> extends DBObjectDial
     }
     @Override
     public void ProcessResult() {
-        Result.machine_id = Global.mainModule.getMachine().id;
+        Result.machine_id = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().id;
         Compiler compiler = (Compiler) fields.cbCompilers.getSelectedItem();
         Result.compiler_id = (compiler != null) ? compiler.id : CommonConstants.Nan;
         Result.command = command;
diff --git a/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java b/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
index e519d870..2b3d34d8 100644
--- a/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
+++ b/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
@@ -6,6 +6,7 @@ import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.Current;
+import _VisualDVM.GlobalData.Makefile.Makefile;
 import _VisualDVM.GlobalData.Module.Module;
 import _VisualDVM.Passes.PassCode;
 
@@ -15,8 +16,8 @@ public class ModulesForm extends DataSetControlForm<Module> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.Module;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
@@ -56,7 +57,8 @@ public class ModulesForm extends DataSetControlForm<Module> {
     }
     @Override
     public boolean isObjectVisible(Module object) {
-        return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Makefile, object.makefile_id);
+        return super.isObjectVisible(object) &&
+                MainModule_.instance.getDb().getTable(Makefile.class).getUI().matchCurrentID(object.makefile_id);
     }
     @Override
     protected DBObjectDialog<Module, ? extends DialogFields> getDialog() {
diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationDialog.java b/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationDialog.java
index 5c5deea2..358113ed 100644
--- a/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationDialog.java
+++ b/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationDialog.java
@@ -1,10 +1,12 @@
 package _VisualDVM.GlobalData.RunConfiguration.UI;
 import Common.CommonConstants;
+import Common.MainModule_;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.Compiler.CompilerType;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 
 import javax.swing.*;
@@ -45,7 +47,7 @@ public class RunConfigurationDialog extends DBObjectDialog<RunConfiguration, Run
     }
     @Override
     public void ProcessResult() {
-        Result.machine_id = Global.mainModule.getMachine().id;
+        Result.machine_id = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().id;
         Result.LauncherCall = fields.cbLauncherCall.getSelectedItem().toString();
         Result.LauncherOptions = (String) fields.cbLaunchOptions.getSelectedItem();
         if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) {
diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java b/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
index cb66649a..11f40f77 100644
--- a/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
+++ b/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
@@ -5,6 +5,7 @@ import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import _VisualDVM.Passes.PassCode;
 
@@ -14,8 +15,8 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.RunConfiguration;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     public String[] getUIColumnNames() {
@@ -69,7 +70,8 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
     }
     @Override
     public boolean isObjectVisible(RunConfiguration object) {
-        return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
+        return super.isObjectVisible(object) &&
+                MainModule_.instance.getDb().getTable(Machine.class).getUI().matchCurrentID(object.machine_id);
     }
     @Override
     protected DBObjectDialog getDialog() {
diff --git a/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java b/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java
index 492d0e96..ffe5b1d5 100644
--- a/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java
+++ b/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java
@@ -15,10 +15,6 @@ public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.SapforProfile;
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
diff --git a/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java b/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java
index 097dd333..17c417da 100644
--- a/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java
+++ b/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java
@@ -3,6 +3,8 @@ import Common.Database.Tables.DataSet;
 import Common.MainModule_;
 import Common.Visual.DataSetControlForm;
 import _VisualDVM.Current;
+import _VisualDVM.GlobalData.Machine.Machine;
+import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
 import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
 
 import javax.swing.*;
@@ -11,8 +13,8 @@ public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileS
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.SapforProfileSetting;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     public String[] getUIColumnNames() {
@@ -42,6 +44,7 @@ public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileS
     }
     @Override
     public boolean isObjectVisible(SapforProfileSetting object) {
-        return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.SapforProfile, object.sapforprofile_id);
+        return super.isObjectVisible(object) &&
+                MainModule_.instance.getDb().getTable(SapforProfile.class).getUI().matchCurrentID(object.sapforprofile_id);
     }
 }
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
index 2def04ef..9ea36ca7 100644
--- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
@@ -5,9 +5,10 @@ import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererDate;
 import Common.Visual.Tables.RendererStatusEnum;
-import _VisualDVM.Current;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
+import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
@@ -16,8 +17,8 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.CompilationTask;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
@@ -62,8 +63,8 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
     @Override
     public boolean isObjectVisible(CompilationTask object) {
         return super.isObjectVisible(object) &&
-                MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id) &&
-                MainModule_.instance.matchCurrentID(Current.User, object.user_id) &&
+                MainModule_.instance.getDb().matchCurrentID(Machine.class, object.machine_id) &&
+                MainModule_.instance.getDb().matchCurrentID(User.class, object.user_id) &&
                 Global.mainModule.HasProject() &&
                 object.belongsToProject(Global.mainModule.getProject());
     }
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
index de2b2197..321656f3 100644
--- a/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
@@ -7,7 +7,11 @@ import Common.Visual.Tables.RendererDate;
 import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
+import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
+import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
+import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
@@ -16,8 +20,8 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.RunTask;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
@@ -74,11 +78,11 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
     @Override
     public boolean isObjectVisible(RunTask object) {
         return super.isObjectVisible(object) &&
-                MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id) &&
-                MainModule_.instance.matchCurrentID(Current.User, object.user_id) &&
-                MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id) &&
+                MainModule_.instance.getDb().getTable(Machine.class).getUI().matchCurrentID(object.machine_id) &&
+                MainModule_.instance.getDb().getTable(User.class).getUI().matchCurrentID(object.user_id) &&
+                MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().matchCurrentID(object.run_configuration_id) &&
                 Global.mainModule.HasProject() &&
                 object.belongsToProject(Global.mainModule.getProject()) &&
-                MainModule_.instance.matchCurrentID(Current.CompilationTask, object.compilation_task_id);
+                MainModule_.instance.getDb().getTable(CompilationTask.class).getUI().matchCurrentID(object.compilation_task_id);
     }
 }
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java
index 3cef1c3a..aeac9c62 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java
@@ -1,5 +1,8 @@
 package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Linux;
+import Common.MainModule_;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
+import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 
 import java.util.Map;
@@ -16,7 +19,7 @@ public class LinuxLocalRunSupervisor extends LinuxLocalTaskSupervisor<RunTask> {
     }
     @Override
     protected Map<String, String> getEnvs() {
-        return Global.mainModule.getRunConfiguration().getEnvMap();
+        return MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().getCurrent().getEnvMap();
     }
     @Override
     protected String getScriptText() {
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java
index 12bdcbce..d2551568 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java
@@ -1,5 +1,8 @@
 package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Windows;
+import Common.MainModule_;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
+import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 
 import java.util.Map;
@@ -25,7 +28,7 @@ public class WindowsLocalRunSupervisor extends WindowsLocalTaskSupervisor<RunTas
     }
     @Override
     protected Map<String, String> getEnvs() {
-        return Global.mainModule.getRunConfiguration().getEnvMap();
+        return MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().getCurrent().getEnvMap();
     }
     void kill_mpi() throws Exception {
     }
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java
index 395b29b4..6a0896b9 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java
@@ -1,7 +1,10 @@
 package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
+import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import _VisualDVM.GlobalData.Tasks.QueueSystem.MVS;
 import _VisualDVM.GlobalData.Tasks.TaskState;
 public class MVSRunSupervisor extends ServerRunSupervisor {
@@ -29,7 +32,7 @@ public class MVSRunSupervisor extends ServerRunSupervisor {
     }
     @Override
     protected void StartTask() throws Exception {
-        String env = String.join(" ", Global.mainModule.getRunConfiguration().getEnvList());
+        String env = String.join(" ", MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().getCurrent().getEnvList());
         mvs_time = (task.maxtime / 60); //в минутах
         if (task.maxtime % 60 > 0) mvs_time += 1;
         String res = "maxtime=" + Utils_.DQuotes(mvs_time) + " ./run";
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java
index 95ebf2b8..eae31631 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java
@@ -1,6 +1,9 @@
 package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
+import Common.MainModule_;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
+import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.Utils;
@@ -14,7 +17,7 @@ public class ServerRunSupervisor extends RemoteTaskSupervisor<RunTask> {
     @Override
     protected void StartTask() throws Exception {
         String res = "./run";
-        String env = String.join(" ", Global.mainModule.getRunConfiguration().getEnvList());
+        String env = String.join(" ", MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().getCurrent().getEnvList());
         if (!env.isEmpty()) res = env + " " + res;
         //--
         task.PID = pass.user.connection.startShellProcess(getRemoteProject(), "PID",
diff --git a/src/_VisualDVM/GlobalData/User/UI/UserDialog.java b/src/_VisualDVM/GlobalData/User/UI/UserDialog.java
index 764f6061..5a0f9195 100644
--- a/src/_VisualDVM/GlobalData/User/UI/UserDialog.java
+++ b/src/_VisualDVM/GlobalData/User/UI/UserDialog.java
@@ -1,6 +1,8 @@
 package _VisualDVM.GlobalData.User.UI;
+import Common.MainModule_;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Machine.MachineType;
 import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.GlobalData.User.UserAuthentication;
@@ -14,7 +16,7 @@ public class UserDialog extends DBObjectDialog<User, UserFields> {
     }
     @Override
     public void fillFields() {
-        if (Global.mainModule.getMachine().type.equals(MachineType.Local)) {
+        if (MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().type.equals(MachineType.Local)) {
             Result.login = "этот пользователь";
             fields.tfLogin.setEditable(false);
         }
@@ -29,7 +31,7 @@ public class UserDialog extends DBObjectDialog<User, UserFields> {
     }
     @Override
     public void ProcessResult() {
-        Result.machine_id = Global.mainModule.getMachine().id;
+        Result.machine_id = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().id;
         Result.login = fields.tfLogin.getText();
         Result.authentication = UserAuthentication.password;
         Result.password = new String(fields.tfPassword.getPassword());
diff --git a/src/_VisualDVM/GlobalData/User/UI/UsersForm.java b/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
index 697ba9fc..ef28d9e6 100644
--- a/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
+++ b/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
@@ -7,6 +7,7 @@ import Common.Visual.Tables.RendererStatusEnum;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.Passes.PassCode;
 
@@ -16,8 +17,8 @@ public class UsersForm extends DataSetControlForm<User> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.User;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
@@ -65,7 +66,8 @@ public class UsersForm extends DataSetControlForm<User> {
     }
     @Override
     public boolean isObjectVisible(User object) {
-        return super.isObjectVisible(object) && super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
+        return super.isObjectVisible(object) &&
+                MainModule_.instance.getDb().getTable(Machine.class).getUI().matchCurrentID(object.machine_id);
     }
     @Override
     protected DBObjectDialog getDialog() {
diff --git a/src/_VisualDVM/MainModule.java b/src/_VisualDVM/MainModule.java
index 07824484..f12b9864 100644
--- a/src/_VisualDVM/MainModule.java
+++ b/src/_VisualDVM/MainModule.java
@@ -2,39 +2,15 @@ package _VisualDVM;
 import Common.MainModule_;
 import Common.Utils.Vector_;
 import _VisualDVM.GlobalData.Account.Account;
-import _VisualDVM.GlobalData.Compiler.Compiler;
-import _VisualDVM.GlobalData.Credentials.Credentials;
 import _VisualDVM.GlobalData.GlobalDatabase;
-import _VisualDVM.GlobalData.Machine.Machine;
-import _VisualDVM.GlobalData.Makefile.Makefile;
-import _VisualDVM.GlobalData.Module.Module;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
-import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
-import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
 import _VisualDVM.GlobalData.Settings.SettingName;
-import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
-import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
-import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.ProjectData.ProjectView;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
-import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
-import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.Component.Component;
 import _VisualDVM.Repository.Component.Sapfor.Sapfor;
-import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
-import _VisualDVM.Repository.Subscribes.Subscriber;
-import _VisualDVM.TestingSystem.Common.Group.Group;
-import _VisualDVM.TestingSystem.Common.Test.Test;
-import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
-import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
-import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
-import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
-import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
 import _VisualDVM.Visual.MainUI;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -73,6 +49,8 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
         return "_VisualDVM.Passes.All.";
     }
     //--
+    public boolean HasAccount(){return get(Current.Account)!=null; } //Бессмысленно. аккаунт всегда подразумевается. вывести.
+    public Account getAccount(){return (Account) get(Current.Account);} //временно
     public boolean HasProject() {
         return get(Current.Project) != null;
     }
@@ -83,54 +61,15 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
     public boolean HasFile() {
         return get(Current.File) != null;
     }
-    public boolean HasAccount() {
-        return get(Current.Account) != null;
-    }
-    public boolean HasMachine() {
-        return get(Current.Machine) != null;
-    }
-    public boolean HasUser() {
-        return get(Current.User) != null;
-    }
-    public boolean HasCompiler() {
-        return get(Current.Compiler) != null;
-    }
     public boolean HasRemoteFile() {
         return get(Current.RemoteFile) != null;
     }
-    public boolean HasMakefile() {
-        return get(Current.Makefile) != null;
-    }
-    public boolean HasRunConfiguration() {
-        return get(Current.RunConfiguration) != null;
-    }
-    public boolean HasCompilationTask() {
-        return get(Current.CompilationTask) != null;
-    }
-    public boolean HasRunTask() {
-        return get(Current.RunTask) != null;
-    }
     public boolean HasProjectView() {
         return get(Current.ProjectView) != null;
     }
-    public Credentials getCredentials() {
-        return (Credentials) get(Current.Credentials);
-    }
-    public SapforSettings getSapforSettings() {
-        return (SapforSettings) get(Current.SapforSettings);
-    }
-    public boolean HasSapforSettings() {
-        return get(Current.SapforSettings) != null;
-    }
     public DBProjectFile getFile() {
         return (DBProjectFile) get(Current.File);
     }
-    public Component getComponent() {
-        return (Component) get(Current.Component);
-    }
-    public BugReport getBugReport() {
-        return (BugReport) get(Current.BugReport);
-    }
     public db_project_info getRoot() {
         return (db_project_info) get(Current.Root);
     }
@@ -140,66 +79,12 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
     public db_project_info getVersion() {
         return (db_project_info) get(Current.Version);
     }
-    public Account getAccount() {
-        return (Account) get(Current.Account);
-    }
-    public boolean HasSubscriber() {
-        return get(Current.Subscriber) != null;
-    }
-    public Subscriber getSubscriber() {
-        return (Subscriber) get(Current.Subscriber);
-    }
-    public Machine getMachine() {
-        return (Machine) get(Current.Machine);
-    }
-    public User getUser() {
-        return (User) get(Current.User);
-    }
-    public Compiler getCompiler() {
-        return (Compiler) get(Current.Compiler);
-    }
-    public CompilationTask getCompilationTask() {
-        return (CompilationTask) get(Current.CompilationTask);
-    }
-    public RunTask getRunTask() {
-        return (RunTask) get(Current.RunTask);
-    }
     public RemoteFile getRemoteFile() {
         return (RemoteFile) get(Current.RemoteFile);
     }
-    public Makefile getMakefile() {
-        return (Makefile) get(Current.Makefile);
-    }
-    public Module getModule() {
-        return (Module) get(Current.Module);
-    }
-    public RunConfiguration getRunConfiguration() {
-        return (RunConfiguration) get(Current.RunConfiguration);
-    }
     public Sapfor getSapfor() {
         return (Sapfor) get(Current.Sapfor);
     }
-    public boolean HasGroup() {
-        return get(Current.Group) != null;
-    }
-    public Group getGroup() {
-        return (Group) get(Current.Group);
-    }
-    public boolean HasConfiguration() {
-        return get(Current.DVMConfiguration) != null;
-    }
-    public DVMConfiguration getDVMConfiguration() {
-        return (DVMConfiguration) get(Current.DVMConfiguration);
-    }
-    public SapforConfiguration getSapforConfiguration() {
-        return (SapforConfiguration) get(Current.SapforConfiguration);
-    }
-    public Test getTest() {
-        return (Test) get(Current.Test);
-    }
-    public boolean HasTest() {
-        return get(Current.Test) != null;
-    }
     public boolean HasVersion() {
         return get(Current.Version) != null;
     }
@@ -225,15 +110,6 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
     public DBProjectFile getSelectedFile() {
         return (DBProjectFile) get(Current.SelectedFile);
     }
-    public boolean HasBugReport() {
-        return get(Current.BugReport) != null;
-    }
-    public ParallelRegion getParallelRegion() {
-        return (ParallelRegion) get(Current.ParallelRegion);
-    }
-    public boolean HasParallelRegion() {
-        return get(Current.ParallelRegion) != null;
-    }
     public boolean HasFunction() {
         return get(Current.Function) != null;
     }
@@ -246,63 +122,18 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
     public FuncInfo getSelectionFunction() {
         return (FuncInfo) get(Current.SelectedFunction);
     }
-    public boolean HasScenario() {
-        return get(Current.Scenario) != null;
-    }
     public db_project_info getPackageVersion() {
         return (db_project_info) get(Current.PackageVersion);
     }
     public boolean HasPackageVersion() {
         return get(Current.PackageVersion) != null;
     }
-    public boolean HasSapforConfiguration() {
-        return get(Current.SapforConfiguration) != null;
-    }
     public ProjectView getProjectView() {
         return (ProjectView) get(Current.ProjectView);
     }
-    public boolean HasSapforProfile() {
-        return get(Current.SapforProfile) != null;
-    }
-    public SapforProfile getSapforProfile() {
-        return (SapforProfile) get(Current.SapforProfile);
-    }
-    public boolean HasServerSapfor() {
-        return get(Current.ServerSapfor) != null;
-    }
-    public ServerSapfor getServerSapfor() {
-        return (ServerSapfor) get(Current.ServerSapfor);
-    }
-    public boolean HasSubscriberWorkspace() {
-        return get(Current.SubscriberWorkspace) != null;
-    }
-    public SubscriberWorkspace getSubscriberWorkspace() {
-        return (SubscriberWorkspace) get(Current.SubscriberWorkspace);
-    }
-    public boolean HasDVMPackage() {
-        return get(Current.DVMPackage) != null;
-    }
-    public DVMPackage getDVMPackage() {
-        return (DVMPackage) get(Current.DVMPackage);
-    }
-    public boolean HasSapforPackage() {
-        return get(Current.SapforPackage) != null;
-    }
-    public SapforPackage getSapforPackage() {
-        return (SapforPackage) get(Current.SapforPackage);
-    }
-    public boolean HasDVMRunTask() {
-        return get(Current.DVMRunTask) != null;
-    }
-    public DVMRunTask getDVMRunTask() {
-        return (DVMRunTask) get(Current.DVMRunTask);
-    }
     public void DropCurrentFile() {
         set(Current.File, null);
         set(Current.FileGraphElement, null);
-        set(Current.Notes, null);
-        set(Current.Warnings, null);
-        set(Current.Errors, null);
     }
     public void DropCurrentProject() {
         set(Current.Project, null);
@@ -312,10 +143,6 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
         set(Current.ProjectNode, null);
         set(Current.SelectedFile, null);
         set(Current.SelectedDirectory, null);
-        set(Current.ParallelVariant, null);
-        set(Current.Dimensions, null);
-        set(Current.Array, null);
-        set(Current.DBArray, null);
     }
     public void SetUserPassesAccess() {
         for (PassCode code : accountRoleDependentPasses)
diff --git a/src/_VisualDVM/Passes/All/AbortDVMPackage.java b/src/_VisualDVM/Passes/All/AbortDVMPackage.java
index 86ffdc66..9e62ea1a 100644
--- a/src/_VisualDVM/Passes/All/AbortDVMPackage.java
+++ b/src/_VisualDVM/Passes/All/AbortDVMPackage.java
@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.All;
-import _VisualDVM.Current;
 import _VisualDVM.Passes.Testing.AbortTestingPackage;
+import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 public class AbortDVMPackage extends AbortTestingPackage {
     @Override
-    public Current currentName() {
-        return Current.DVMPackage;
+    public Class currentClass() {
+        return DVMPackage.class;
     }
     @Override
     public int getAbortType() {
diff --git a/src/_VisualDVM/Passes/All/AbortSapforPackage.java b/src/_VisualDVM/Passes/All/AbortSapforPackage.java
index 2e4e50ed..8a38e194 100644
--- a/src/_VisualDVM/Passes/All/AbortSapforPackage.java
+++ b/src/_VisualDVM/Passes/All/AbortSapforPackage.java
@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.All;
-import _VisualDVM.Current;
 import _VisualDVM.Passes.Testing.AbortTestingPackage;
+import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 public class AbortSapforPackage extends AbortTestingPackage {
     @Override
-    public Current currentName() {
-        return Current.SapforPackage;
+    public Class currentClass() {
+        return SapforPackage.class;
     }
     @Override
     public int getAbortType() {
diff --git a/src/_VisualDVM/Passes/All/AddCompiler.java b/src/_VisualDVM/Passes/All/AddCompiler.java
index 9d493047..948d1efd 100644
--- a/src/_VisualDVM/Passes/All/AddCompiler.java
+++ b/src/_VisualDVM/Passes/All/AddCompiler.java
@@ -8,7 +8,7 @@ public class AddCompiler extends AddObjectPass<Compiler> {
         super(Compiler.class);
     }
     @Override
-    public Class<? extends DBObject> getOwner() {
+    protected Class<? extends DBObject> getOwnerClass() {
         return Machine.class;
     }
 }
diff --git a/src/_VisualDVM/Passes/All/AddDVMParameter.java b/src/_VisualDVM/Passes/All/AddDVMParameter.java
index b1b64f43..a3db6370 100644
--- a/src/_VisualDVM/Passes/All/AddDVMParameter.java
+++ b/src/_VisualDVM/Passes/All/AddDVMParameter.java
@@ -8,7 +8,7 @@ public class AddDVMParameter extends AddObjectPass<DVMParameter> {
         super(DVMParameter.class);
     }
     @Override
-    public Class<? extends DBObject> getOwner() {
+    protected Class<? extends DBObject> getOwnerClass() {
         return RunConfiguration.class;
     }
 }
diff --git a/src/_VisualDVM/Passes/All/AddMakefile.java b/src/_VisualDVM/Passes/All/AddMakefile.java
index 753ba579..e5de6f3a 100644
--- a/src/_VisualDVM/Passes/All/AddMakefile.java
+++ b/src/_VisualDVM/Passes/All/AddMakefile.java
@@ -10,7 +10,7 @@ public class AddMakefile extends AddObjectPass<Makefile> {
         super(Makefile.class);
     }
     @Override
-    public Class<? extends DBObject> getOwner() {
+    protected Class<? extends DBObject> getOwnerClass() {
         return Machine.class;
     }
     @Override
diff --git a/src/_VisualDVM/Passes/All/AddRunConfiguration.java b/src/_VisualDVM/Passes/All/AddRunConfiguration.java
index 77041529..f82b20dd 100644
--- a/src/_VisualDVM/Passes/All/AddRunConfiguration.java
+++ b/src/_VisualDVM/Passes/All/AddRunConfiguration.java
@@ -8,7 +8,7 @@ public class AddRunConfiguration extends AddObjectPass<RunConfiguration> {
         super(RunConfiguration.class);
     }
     @Override
-    public Class<? extends DBObject> getOwner() {
+    protected Class<? extends DBObject> getOwnerClass() {
         return Machine.class;
     }
 }
diff --git a/src/_VisualDVM/Passes/All/AddUser.java b/src/_VisualDVM/Passes/All/AddUser.java
index 0de987a4..1384d0be 100644
--- a/src/_VisualDVM/Passes/All/AddUser.java
+++ b/src/_VisualDVM/Passes/All/AddUser.java
@@ -11,13 +11,13 @@ public class AddUser extends AddObjectPass<User> {
         super(User.class);
     }
     @Override
-    public Class<? extends DBObject> getOwner() {
+    protected Class<? extends DBObject> getOwnerClass() {
         return Machine.class;
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
         if (super.canStart(args)) {
-            Machine machine = Global.mainModule.getMachine();
+            Machine machine = (Machine) getOwner();
             if (machine.type.equals(MachineType.Local) && (machine.getUsers().size() > 0)) {
                 Log.Writeln_("У локальной машины может быть только один пользователь");
                 return false;
diff --git a/src/_VisualDVM/Passes/All/AppendBugReportField.java b/src/_VisualDVM/Passes/All/AppendBugReportField.java
index 32ef327f..c1a1d517 100644
--- a/src/_VisualDVM/Passes/All/AppendBugReportField.java
+++ b/src/_VisualDVM/Passes/All/AppendBugReportField.java
@@ -1,6 +1,5 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
-import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
@@ -29,8 +28,8 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (Global.mainModule.Check(Log, Current.BugReport)) {
-            target = Global.mainModule.getBugReport();
+        if (server.db.bugReports.getUI().Check(Log)) {
+            target = server.db.bugReports.getUI().getCurrent();
             if (!target.CheckNotDraft(Log))
                 return false;
             fieldName = (String) args[0];
@@ -61,7 +60,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
     }
     @Override
     protected void showFinish() throws Exception {
-        server.db.bugReports.getUI().Refresh();
+        server.db.bugReports.RefreshUI();
         Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
     }
     @Override
diff --git a/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java b/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java
index 75adacf0..a79633f8 100644
--- a/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java
+++ b/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java
@@ -22,8 +22,8 @@ public class ApplyBugReportSettings extends Pass<BugReport> {
     }
     @Override
     protected boolean canStart(Object... args) {
-        if (Global.mainModule.Check(Log, Current.BugReport)) {
-            target = Global.mainModule.getBugReport();
+        if (Global.componentsServer.db.bugReports.getUI().Check(Log)) {
+            target = Global.componentsServer.db.bugReports.getUI().getCurrent();
             long vv = target.visualiser_version;
             if (vv < 500) {
                 Log.Writeln_("Автоматическое применение настроек поддерживается только в отчётах об ошибках,\n" +
diff --git a/src/_VisualDVM/Passes/All/ApplyProfile.java b/src/_VisualDVM/Passes/All/ApplyProfile.java
index 2e4d0ad2..fd28dbbc 100644
--- a/src/_VisualDVM/Passes/All/ApplyProfile.java
+++ b/src/_VisualDVM/Passes/All/ApplyProfile.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Passes.All;
+import Common.MainModule_;
 import Common.Passes.Pass;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
@@ -22,8 +23,8 @@ public class ApplyProfile extends Pass<SapforProfile> {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (Global.mainModule.Check(Log, Current.SapforProfile)) {
-            target = (SapforProfile) Global.mainModule.get(Current.SapforProfile);
+        if (MainModule_.instance.getDb().getTable(SapforProfile.class).getUI().Check(Log)) {
+            target = MainModule_.instance.getDb().getTable(SapforProfile.class).getUI().getCurrent();
             return true;
         }
         return false;
diff --git a/src/_VisualDVM/Passes/All/BuildComponent.java b/src/_VisualDVM/Passes/All/BuildComponent.java
index e40ab065..3a77fe37 100644
--- a/src/_VisualDVM/Passes/All/BuildComponent.java
+++ b/src/_VisualDVM/Passes/All/BuildComponent.java
@@ -19,7 +19,7 @@ public class BuildComponent extends ProcessPass<Component> {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        target = Global.mainModule.getComponent();
+        target = Global.components.getUI().getCurrent();
         return true;
     }
     @Override
diff --git a/src/_VisualDVM/Passes/All/CheckAccount.java b/src/_VisualDVM/Passes/All/CheckAccount.java
index 0a2cc439..c509dd69 100644
--- a/src/_VisualDVM/Passes/All/CheckAccount.java
+++ b/src/_VisualDVM/Passes/All/CheckAccount.java
@@ -56,7 +56,7 @@ public class CheckAccount extends Pass<Boolean> {
     protected void showDone() throws Exception {
         if (Global.mainModule.getUI().getMainWindow() != null) {
             Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowAccount();
-            if (Global.mainModule.HasBugReport())
+            if (Global.componentsServer.db.bugReports.getUI().getCurrent()!=null)
                 Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
         }
         if (Global.mainModule.getAccount().isAdmin())
diff --git a/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java b/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java
index 201b6836..06a8b3ad 100644
--- a/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java
+++ b/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java
@@ -1,5 +1,8 @@
 package _VisualDVM.Passes.All;
+import Common.MainModule_;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
+import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -13,8 +16,8 @@ public class CheckRemoteWorkspace extends ComponentsRepositoryPass<SubscriberWor
     @Override
     protected void ServerAction() throws Exception {
         String email = Global.mainModule.getAccount().email;
-        String machineURL = Global.mainModule.getMachine().getURL();
-        String login = Global.mainModule.getUser().login;
+        String machineURL = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().getURL();
+        String login = MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent().login;
         Command(new ServerExchangeUnit_2021(ServerCode.CheckURLRegistered,
                 email + "\n" + machineURL + "\n" + login));
         target = (SubscriberWorkspace) response.object;
diff --git a/src/_VisualDVM/Passes/All/CloneDVMSettings.java b/src/_VisualDVM/Passes/All/CloneDVMSettings.java
index b8a8ef79..8a6a3971 100644
--- a/src/_VisualDVM/Passes/All/CloneDVMSettings.java
+++ b/src/_VisualDVM/Passes/All/CloneDVMSettings.java
@@ -9,7 +9,7 @@ public class CloneDVMSettings extends CloneServerObject<TestingServer, DVMSettin
         super(Global.testingServer, DVMSettings.class);
     }
     @Override
-    protected Current currentName() {
-        return Current.DVMSettings;
+    protected Class currentClass() {
+        return DVMSettings.class;
     }
 }
diff --git a/src/_VisualDVM/Passes/All/CloneSapforSettings.java b/src/_VisualDVM/Passes/All/CloneSapforSettings.java
index e2ca8e1f..b8c496b4 100644
--- a/src/_VisualDVM/Passes/All/CloneSapforSettings.java
+++ b/src/_VisualDVM/Passes/All/CloneSapforSettings.java
@@ -16,8 +16,8 @@ public class CloneSapforSettings extends CloneServerObject<TestingServer, Sapfor
         super(Global.testingServer, SapforSettings.class);
     }
     @Override
-    protected Current currentName() {
-        return Current.SapforSettings;
+    protected Class currentClass() {
+        return SapforSettings.class;
     }
     @Override
     protected void ServerAction() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java b/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java
index 761b0484..1b668259 100644
--- a/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java
+++ b/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java
@@ -37,8 +37,8 @@ public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {
             master = target.get(0);
             slave = null;
             return UI.Question("Отобразить задачу " + Utils_.Brackets(master.getPK()));
-        } else if ((target.size() == 0) && (Global.mainModule.HasDVMRunTask())) {
-            master = Global.mainModule.getDVMRunTask();
+        } else if ((target.size() == 0) && (Global.testingServer.db.dvmRunTasks.getUI().getCurrent()!=null)) {
+            master = Global.testingServer.db.dvmRunTasks.getUI().getCurrent();
             slave = null;
             return UI.Question("Отобразить задачу " + Utils_.Brackets(master.getPK()));
         } else {
diff --git a/src/_VisualDVM/Passes/All/CompareSapforPackages.java b/src/_VisualDVM/Passes/All/CompareSapforPackages.java
index aea94bf5..6378c422 100644
--- a/src/_VisualDVM/Passes/All/CompareSapforPackages.java
+++ b/src/_VisualDVM/Passes/All/CompareSapforPackages.java
@@ -37,8 +37,8 @@ public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
             master = target.get(0);
             slave = null;
             return UI.Question("Отобразить пакет " + Utils_.Brackets(master.getPK()));
-        } else if ((target.size() == 0) && (Global.mainModule.HasSapforPackage())) {
-            master = Global.mainModule.getSapforPackage();
+        } else if ((target.size() == 0) && ( (Global.testingServer.db.sapforPackages.getUI().getCurrent()!=null))) {
+            master = Global.testingServer.db.sapforPackages.getUI().getCurrent();
             slave = null;
             return UI.Question("Отобразить пакет " + Utils_.Brackets(master.getPK()));
         } else {
diff --git a/src/_VisualDVM/Passes/All/Compile.java b/src/_VisualDVM/Passes/All/Compile.java
index b01ca71c..8f1c95eb 100644
--- a/src/_VisualDVM/Passes/All/Compile.java
+++ b/src/_VisualDVM/Passes/All/Compile.java
@@ -4,8 +4,11 @@ import Common.Passes.PassException;
 import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
+import _VisualDVM.GlobalData.Makefile.Makefile;
 import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
 import _VisualDVM.GlobalData.Tasks.TaskState;
+import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.GlobalData.User.UserState;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.LanguageName;
@@ -13,6 +16,9 @@ import _VisualDVM.ProjectData.Project.db_project_info;
 public class Compile extends Pass<db_project_info> {
     Pass subpass = null;
     CompilationTask compilationTask = null;
+    Machine machine = null;
+    User user = null;
+    Makefile makefile = null;
     @Override
     protected PassCode necessary() {
         return Global.mainModule.getProject().languageName.equals(LanguageName.fortran) ? PassCode.SPF_ParseFilesWithOrder : null;
@@ -27,15 +33,23 @@ public class Compile extends Pass<db_project_info> {
     }
     @Override
     protected boolean canStart(Object... args) {
-        if (Global.mainModule.Check(Log, Current.Project, Current.Machine, Current.User, Current.Makefile)) {
+        if (Global.mainModule.Check(Log, Current.Project) && Global.mainModule.getDb().Check(Log, Machine.class, User.class, Makefile.class)) {
             target = Global.mainModule.getProject();
+            //--
+            machine = Global.mainModule.getDb().getTable(Machine.class).getUI().getCurrent();
+            user=  Global.mainModule.getDb().getTable(User.class).getUI().getCurrent();
+            makefile= Global.mainModule.getDb().getTable(Makefile.class).getUI().getCurrent();
+            //--
             subpass = null;
             compilationTask = null;
-            if (Global.mainModule.getUser().state != UserState.ready_to_work)
-                Log.Writeln_("Пользователь " + Utils_.Brackets(Global.mainModule.getUser().login) +
+            if (user.state != UserState.ready_to_work)
+                Log.Writeln_("Пользователь " +
+                        Utils_.Brackets(
+                                user.login
+                        ) +
                         " не проинициализирован\nПерейдите на вкладку 'Настройки компиляции и запуска',\n" +
                         " и выполните команду 'Инициализация пользователя'\n");
-            Global.mainModule.getMakefile().Validate(Log);
+            makefile.Validate(Log);
             return Log.isEmpty();
         }
         return false;
@@ -43,9 +57,9 @@ public class Compile extends Pass<db_project_info> {
     @Override
     protected void performPreparation() throws Exception {
         compilationTask = new CompilationTask();
-        compilationTask.machine_id = Global.mainModule.getMachine().id;
-        compilationTask.user_id = Global.mainModule.getUser().id;
-        compilationTask.makefile_id = Global.mainModule.getMakefile().id;
+        compilationTask.machine_id = machine.id;
+        compilationTask.user_id = user.id;
+        compilationTask.makefile_id = makefile.id;
         compilationTask.project_path = target.Home.getAbsolutePath();
         compilationTask.project_description = target.description;
         //------------------------------------------
@@ -60,7 +74,7 @@ public class Compile extends Pass<db_project_info> {
     }
     @Override
     protected void body() throws Exception {
-        switch (Global.mainModule.getMachine().type) {
+        switch (machine.type) {
             case Local:
                 if (Utils_.isWindows()) {
                     subpass = Global.mainModule.getPass(PassCode.WindowsLocalCompilation);
@@ -69,12 +83,13 @@ public class Compile extends Pass<db_project_info> {
                 break;
             case Undefined:
             case MVS_cluster:
-                throw new PassException("Компиляция не реализована для типа машины " + Utils_.DQuotes(Global.mainModule.getMachine().type));
+                throw new PassException("Компиляция не реализована для типа машины " +
+                        Utils_.DQuotes(machine.type));
             default:
                 subpass = Global.mainModule.getPass(PassCode.RemoteCompilation);
                 break;
         }
-        subpass.Do(Global.mainModule.getCompilationTask(), Global.mainModule.getProject());
+        subpass.Do(compilationTask, Global.mainModule.getProject());
     }
     @Override
     protected boolean validate() {
diff --git a/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java b/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
index b1c94032..47bfe1d7 100644
--- a/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
+++ b/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
@@ -27,7 +27,7 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
             Log.Writeln_("Вы не являетесь администратором");
             return false;
         }
-        if (!Global.mainModule.Check(Log, Current.ServerSapfor)) {
+        if (! Global.testingServer.db.serverSapfors.getUI().Check(Log)) {
             return false;
         }
         return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.");
@@ -49,7 +49,8 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
     @Override
     protected void ServerAction() throws Exception {
         Command(new ServerExchangeUnit_2021(ServerCode.RefreshDVMTests,
-                String.valueOf(Global.mainModule.getServerSapfor().id), Global.mainModule.getAccount()));
+                String.valueOf(
+                        Global.testingServer.db.serverSapfors.getUI().getCurrent().id), Global.mainModule.getAccount()));
     }
     @Override
     protected void performFinish() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java b/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java
index c45c3026..a0b76f5e 100644
--- a/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java
+++ b/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java
@@ -58,7 +58,7 @@ public class CreateGroupFromDirectory extends PublishTests {
             return false;
         }
         if (Global.mainModule.getPass(PassCode.PublishGroup).Do(dir.getName().toUpperCase())) {
-            group = Global.mainModule.getGroup();
+            group = Global.testingServer.db.groups.getUI().getCurrent();
         } else return false;
         //---------------
         Vector<File> files = new Vector<>(Arrays.asList(files_));
diff --git a/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java b/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java
index 16b137ce..1ecaa234 100644
--- a/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java
+++ b/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java
@@ -43,7 +43,7 @@ public class CreateGroupFromFiles extends PublishTests {
             return false;
         }
         if (Global.mainModule.getPass(PassCode.PublishGroup).Do(dir.getName().toUpperCase())) {
-            group = Global.mainModule.getGroup();
+            group = Global.testingServer.db.groups.getUI().getCurrent();
         } else return false;
         //--
         return super.canStart(files, group);
diff --git a/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java b/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
index 6e4f2a48..468db293 100644
--- a/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
+++ b/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
@@ -71,9 +71,9 @@ public class CreateTestFromDirectory extends Pass<Test> {
         if (args.length == 0) {
             //--
             from_files_chooser = true;
-            if (!Global.mainModule.Check(Log, Current.Group))
+            if (!Global.testingServer.db.groups.getUI().Check(Log))
                 return false;
-            group = Global.mainModule.getGroup();
+            group = Global.testingServer.db.groups.getUI().getCurrent();
             if (!selectFiles())
                 return false;
             //-
diff --git a/src/_VisualDVM/Passes/All/CreateTestFromProject.java b/src/_VisualDVM/Passes/All/CreateTestFromProject.java
index 9ff8efd3..ac708b3b 100644
--- a/src/_VisualDVM/Passes/All/CreateTestFromProject.java
+++ b/src/_VisualDVM/Passes/All/CreateTestFromProject.java
@@ -15,9 +15,9 @@ public class CreateTestFromProject extends CreateTestFromDirectory {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         if (args.length == 0) {
-            if (Global.mainModule.Check(Log, Current.Group, Current.Project)) {
+            if (Global.testingServer.db.groups.getUI().Check(Log) && Global.mainModule.Check(Log, Current.Project)) {
                 project = Global.mainModule.getProject();
-                if (super.canStart(Global.mainModule.getProject().Home, Global.mainModule.getGroup())) {
+                if (super.canStart(Global.testingServer.db.groups.getUI().getCurrent())) {
                     from_files_chooser = true; //чтобы опубликовал.
                     return true;
                 }
diff --git a/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java b/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java
index b1e74a30..40762991 100644
--- a/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java
+++ b/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java
@@ -20,7 +20,7 @@ public class CreateTestsFromFiles extends PublishTests {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (Global.mainModule.Check(Log, Current.Group)) {
+        if (Global.testingServer.db.groups.getUI().Check(Log)) {
             Utils.RestoreSelectedDirectory(fileChooser);
             Vector<File> files = fileChooser.ShowMultiDialog();
             if (files.isEmpty()) {
@@ -28,7 +28,7 @@ public class CreateTestsFromFiles extends PublishTests {
                 return false;
             }
             Global.mainModule.getPass(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, fileChooser.getCurrentDirectory());
-            return super.canStart(files, Global.mainModule.getGroup());
+            return super.canStart(files, Global.testingServer.db.groups.getUI().getCurrent());
         }
         return false;
     }
diff --git a/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java
index 0dad3a7b..aeea8c8f 100644
--- a/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java
+++ b/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java
@@ -22,8 +22,8 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests {
     protected boolean canStart(Object... args) throws Exception {
         target = new Vector<>();
         //---
-        if (Global.mainModule.Check(Log, Current.Group)) {
-            group = Global.mainModule.getGroup();
+        if (Global.testingServer.db.groups.getUI().Check(Log)) {
+            group = Global.testingServer.db.groups.getUI().getCurrent();
         } else
             return false;
         //---------------------
diff --git a/src/_VisualDVM/Passes/All/DownloadComponent.java b/src/_VisualDVM/Passes/All/DownloadComponent.java
index 6a8f82bb..54dd2726 100644
--- a/src/_VisualDVM/Passes/All/DownloadComponent.java
+++ b/src/_VisualDVM/Passes/All/DownloadComponent.java
@@ -8,7 +8,7 @@ import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 public class DownloadComponent extends ComponentsRepositoryPass<Component> {
     @Override
     protected void ServerAction() throws Exception {
-        target = Global.mainModule.getComponent();
+        target = Global.components.getUI().getCurrent();
         String packed = target.getComponentType() + "\n" + target.getFileName();
         Command(new ServerExchangeUnit_2021(ServerCode.ReceiveComponent, packed));
         Utils_.bytesToFile((byte[]) response.object, target.getNewFile());
diff --git a/src/_VisualDVM/Passes/All/DownloadDVMPackage.java b/src/_VisualDVM/Passes/All/DownloadDVMPackage.java
index 4212f35a..08e54fda 100644
--- a/src/_VisualDVM/Passes/All/DownloadDVMPackage.java
+++ b/src/_VisualDVM/Passes/All/DownloadDVMPackage.java
@@ -13,9 +13,9 @@ public class DownloadDVMPackage extends DownloadDVMPackages {
         return "/icons/Comparsion.png";
     }
     protected boolean canStart(Object... args) throws Exception {
-        if (Global.mainModule.Check(Log, Current.DVMPackage)) {
+        if (Global.testingServer.db.dvmPackages.getUI().Check(Log)) {
             //--
-            dvmPackage = Global.mainModule.getDVMPackage();
+            dvmPackage = Global.testingServer.db.dvmPackages.getUI().getCurrent();
             //--
             if (!dvmPackage.state.isDone()
             ) {
diff --git a/src/_VisualDVM/Passes/All/DownloadTaskTest.java b/src/_VisualDVM/Passes/All/DownloadTaskTest.java
index e1fb3b34..cfe6b2ea 100644
--- a/src/_VisualDVM/Passes/All/DownloadTaskTest.java
+++ b/src/_VisualDVM/Passes/All/DownloadTaskTest.java
@@ -11,8 +11,9 @@ public class DownloadTaskTest extends DownloadTest {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = null;
-        if (Global.mainModule.getAccount().CheckRegistered(Log) && Global.mainModule.Check(Log, Current.DVMRunTask)) {
-            DVMRunTask task = Global.mainModule.getDVMRunTask();
+        if (Global.mainModule.getAccount().CheckRegistered(Log) &&
+                Global.testingServer.db.dvmRunTasks.getUI().Check(Log)) {
+            DVMRunTask task = Global.testingServer.db.dvmRunTasks.getUI().getCurrent();
             //-- квазиобъект, нам от него нужно только имя.
             target = new Test();
             target.id = task.test_id;
diff --git a/src/_VisualDVM/Passes/All/DownloadTest.java b/src/_VisualDVM/Passes/All/DownloadTest.java
index b120f713..95965797 100644
--- a/src/_VisualDVM/Passes/All/DownloadTest.java
+++ b/src/_VisualDVM/Passes/All/DownloadTest.java
@@ -20,8 +20,10 @@ public class DownloadTest extends TestingSystemPass<Test> {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (Global.mainModule.getAccount().CheckRegistered(Log) && Global.mainModule.Check(Log, Current.Test)) {
-            target = Global.mainModule.getTest();
+        if (Global.mainModule.getAccount().CheckRegistered(Log) &&
+                Global.testingServer.db.tests.getUI().Check(Log)
+        ) {
+            target = Global.testingServer.db.tests.getUI().getCurrent();
             return true;
         }
         return false;
diff --git a/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java b/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java
index 5c6a44fa..1832db23 100644
--- a/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java
+++ b/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java
@@ -61,9 +61,11 @@ public class ExportDVMPackageToExcel extends Pass<Vector<DVMPackage>> {
         if (Global.testingServer.db.dvmPackages.getUI().getSelectedCount() > 0) {
             target = Global.testingServer.db.dvmPackages.getUI().getSelectedItems();
         } else {
-            if (Global.mainModule.Check(Log, Current.DVMPackage)) {
+            if (Global.testingServer.db.dvmPackages.getUI().Check(Log)) {
                 target = new Vector<>();
-                target.add(Global.mainModule.getDVMPackage());
+                target.add(
+                        Global.testingServer.db.dvmPackages.getUI().getCurrent()
+                );
             } else return false;
         }
         Vector<Integer> packagesToDownload = new Vector<>();
diff --git a/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java b/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java
index 51fe07a3..b2b8c791 100644
--- a/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java
+++ b/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java
@@ -11,17 +11,19 @@ public class GetComponentsBackupsFromServer extends ComponentsRepositoryPass<Vec
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = new Vector<>();
-        return (Global.mainModule.Check(Log, Current.Component));
+        return Global.components.getUI().Check(Log);
     }
     @Override
     protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.GetComponentsBackups, Global.mainModule.getComponent().getComponentType().toString()));
+        Command(new ServerExchangeUnit_2021(ServerCode.GetComponentsBackups,
+                Global.components.getUI().getCurrent().getComponentType().toString()));
         target = (Vector<File>) response.object;
     }
     @Override
     protected boolean validate() {
         if (target.isEmpty()) {
-            Log.Writeln_("Не найдено резервных копий на сервере для компонента " + Global.mainModule.getComponent().getComponentType().getDescription());
+            Log.Writeln_("Не найдено резервных копий на сервере для компонента "
+                    + Global.components.getUI().getCurrent().getComponentType().getDescription());
             return false;
         }
         return true;
diff --git a/src/_VisualDVM/Passes/All/InitialiseUser.java b/src/_VisualDVM/Passes/All/InitialiseUser.java
index 915ba5da..d92a04c5 100644
--- a/src/_VisualDVM/Passes/All/InitialiseUser.java
+++ b/src/_VisualDVM/Passes/All/InitialiseUser.java
@@ -1,9 +1,11 @@
 package _VisualDVM.Passes.All;
+import Common.MainModule_;
 import Common.Passes.Pass;
 import Common.Passes.PassException;
-import _VisualDVM.Current;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
+import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.GlobalData.User.UserState;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
@@ -18,11 +20,13 @@ public class InitialiseUser extends Pass {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        return Global.mainModule.Check(Log, Current.Machine, Current.User);
+        return MainModule_.instance.getDb().Check(Log, Machine.class, User.class);
     }
     @Override
     protected void body() throws Exception {
-        switch (Global.mainModule.getMachine().type) {
+        Machine machine = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent();
+        User user = MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent();
+        switch (machine.type) {
             case Local:
                 Global.mainModule.getPass(PassCode.LocalInitaliseUser).Do();
                 break;
@@ -34,21 +38,21 @@ public class InitialiseUser extends Pass {
                         if (Global.mainModule.getPass(PassCode.RemoteInitialiseUser).Do()) {
                             workspace = new SubscriberWorkspace();
                             workspace.email = Global.mainModule.getAccount().email;
-                            workspace.URL = Global.mainModule.getMachine().getURL();
-                            workspace.login = Global.mainModule.getUser().login;
+                            workspace.URL = machine.getURL();
+                            workspace.login = user.login;
                             workspace.path = ((RemoteFile) Global.mainModule.getPass(PassCode.RemoteInitialiseUser).target).full_name;
                             //---
                             if (Global.mainModule.getPass(PassCode.PublishRemoteWorkspace).Do(workspace)) {
-                                Global.mainModule.getUser().workspace = workspace.path;
-                                Global.mainModule.getUser().state = UserState.ready_to_work;
-                                Global.mainModule.getDb().Update(Global.mainModule.getUser());
+                                user.workspace = workspace.path;
+                                user.state = UserState.ready_to_work;
+                                Global.mainModule.getDb().Update(user);
                             }
                         }
                     } else {
                         //рега была. просто заносим то что там пользователю
-                        Global.mainModule.getUser().workspace = workspace.path;
-                        Global.mainModule.getUser().state = UserState.ready_to_work;
-                        Global.mainModule.getDb().Update(Global.mainModule.getUser());
+                        user.workspace = workspace.path;
+                        user.state = UserState.ready_to_work;
+                        Global.mainModule.getDb().Update(user);
                     }
                 }
                 break;
@@ -58,6 +62,6 @@ public class InitialiseUser extends Pass {
     }
     @Override
     protected void showFinish() throws Exception {
-        Global.mainModule.getDb().users.getUI().Refresh();
+        Global.mainModule.getDb().users.getUI().RedrawControl();
     }
 }
diff --git a/src/_VisualDVM/Passes/All/LocalInitaliseUser.java b/src/_VisualDVM/Passes/All/LocalInitaliseUser.java
index 63d8ca2f..8d1ef210 100644
--- a/src/_VisualDVM/Passes/All/LocalInitaliseUser.java
+++ b/src/_VisualDVM/Passes/All/LocalInitaliseUser.java
@@ -1,6 +1,8 @@
 package _VisualDVM.Passes.All;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.GlobalData.User.UserState;
 import _VisualDVM.Passes.ProcessPass;
@@ -11,7 +13,7 @@ import java.io.File;
 public class LocalInitaliseUser extends ProcessPass<User> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        target = Global.mainModule.getUser();
+        target = MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent();
         return true;
     }
     @Override
diff --git a/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java b/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java
index 31d10f4c..c613b969 100644
--- a/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java
+++ b/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java
@@ -22,8 +22,8 @@ public class OpenBugReportTestProject extends Pass<BugReport> {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (Global.mainModule.Check(Log, Current.BugReport) &&
-                (target = Global.mainModule.getBugReport()).CheckNotDraft(Log)) {
+        if (Global.componentsServer.db.Check(Log, BugReport.class) &&
+                (target = Global.componentsServer.db.bugReports.getUI().getCurrent()).CheckNotDraft(Log)) {
             if (!target.project_version.isEmpty()) {
                 root = Paths.get(ComponentsSet.visualiser.getWorkspace().getAbsolutePath(),
                         target.id).toFile();
diff --git a/src/_VisualDVM/Passes/All/PickCompilerEnvironments.java b/src/_VisualDVM/Passes/All/PickCompilerEnvironments.java
index 6798f487..2c74ad60 100644
--- a/src/_VisualDVM/Passes/All/PickCompilerEnvironments.java
+++ b/src/_VisualDVM/Passes/All/PickCompilerEnvironments.java
@@ -16,6 +16,7 @@ import javax.swing.*;
 import java.util.LinkedHashMap;
 public class PickCompilerEnvironments extends Pass<String> {
     Compiler compiler = null;
+    RunConfiguration configuration = null;
     @Override
     public String getIconPath() {
         return "/icons/Menu/Regions.png";
@@ -27,8 +28,8 @@ public class PickCompilerEnvironments extends Pass<String> {
     //-
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (Global.mainModule.Check(Log, Current.RunConfiguration)) {
-            RunConfiguration configuration = Global.mainModule.getRunConfiguration();
+        if (Global.mainModule.getDb().runConfigurations.getUI().Check(Log)) {
+            configuration = Global.mainModule.getDb().runConfigurations.getUI().getCurrent();
             if (configuration.compiler_id == CommonConstants.Nan) {
                 Log.Writeln_("Отсутвует DVM компилятор, связанный с текущей конфигурацией запуска.\n" +
                         "Если конфигурация содержит вызов DVM компилятора, но была создана на версии 801 и ниже,\n" +
@@ -70,14 +71,14 @@ public class PickCompilerEnvironments extends Pass<String> {
     }
     @Override
     protected void body() throws Exception {
-        LinkedHashMap<String, String> envValues = Global.mainModule.getRunConfiguration().getEnvMap();
+        LinkedHashMap<String, String> envValues = configuration.getEnvMap();
         for (CompilerEnvironment compilerEnv : compiler.environments.Data.values()) {
             if (compilerEnv.isSelected()) {
                 EnvironmentValue confEnv;
                 if (!envValues.containsKey(compilerEnv.name)) {
                     confEnv = new EnvironmentValue();
-                    confEnv.machine_id = Global.mainModule.getRunConfiguration().machine_id;
-                    confEnv.run_configuration_id = Global.mainModule.getRunConfiguration().id;
+                    confEnv.machine_id = configuration.machine_id;
+                    confEnv.run_configuration_id = configuration.id;
                     confEnv.name = compilerEnv.name;
                     confEnv.value = compilerEnv.value;
                     Global.mainModule.getDb().Insert(confEnv);
diff --git a/src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java b/src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java
index 4b0c4c1f..1d1359ce 100644
--- a/src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java
+++ b/src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java
@@ -21,7 +21,7 @@ public class PickCompilerEnvironmentsForTesting extends Pass<String> {
             return false;
         }
         target = "";
-        compiler = Global.mainModule.getCompiler();
+        compiler = Global.mainModule.getDb().compilers.getUI().getCurrent();
         if (!compiler.type.equals(CompilerType.dvm)) {
             Log.Writeln_("Выбор переменных окружения возможен только для DVM компилятора,");
             return false;
diff --git a/src/_VisualDVM/Passes/All/PublishBugReport.java b/src/_VisualDVM/Passes/All/PublishBugReport.java
index 69c07afd..a4096d7c 100644
--- a/src/_VisualDVM/Passes/All/PublishBugReport.java
+++ b/src/_VisualDVM/Passes/All/PublishBugReport.java
@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
-import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.BugReport.BugReport;
@@ -22,8 +21,8 @@ public class PublishBugReport extends Pass<BugReport> {
     }
     @Override
     protected boolean canStart(Object... args) {
-        if (Global.mainModule.Check(Log, Current.BugReport)) {
-            target = Global.mainModule.getBugReport();
+        if ( Global.componentsServer.db.bugReports.getUI().Check(Log)) {
+            target =  Global.componentsServer.db.bugReports.getUI().getCurrent();
             if (!target.state.equals(BugReportState.draft)) {
                 Log.Writeln_("Отчёт об ошибке " + target.id + " уже опубликован!");
                 return false;
@@ -69,7 +68,7 @@ public class PublishBugReport extends Pass<BugReport> {
     }
     @Override
     protected void showDone() throws Exception {
-        Global.componentsServer.db.bugReports.getUI().Refresh();
+        Global.componentsServer.db.bugReports.RefreshUI();
         Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
     }
 }
diff --git a/src/_VisualDVM/Passes/All/PublishComponent.java b/src/_VisualDVM/Passes/All/PublishComponent.java
index fd7b9dec..728eaaca 100644
--- a/src/_VisualDVM/Passes/All/PublishComponent.java
+++ b/src/_VisualDVM/Passes/All/PublishComponent.java
@@ -41,8 +41,8 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
             Log.Writeln_("Вы не являетесь администратором");
         }
         ;
-        if (Global.mainModule.Check(Log, Current.Component)) {
-            target = Global.mainModule.getComponent();
+        if (Global.components.getUI().Check(Log)) {
+            target = Global.components.getUI().getCurrent();
             target.needs_update_minimal_version = false;
             f.fields.cbUpdateMinimalVersion.setSelected(false);
             f.fields.lMinimalVersion.setText(String.valueOf(target.minimal_version));
diff --git a/src/_VisualDVM/Passes/All/PublishSapforSettingsCommand.java b/src/_VisualDVM/Passes/All/PublishSapforSettingsCommand.java
index 7de69165..469c5f31 100644
--- a/src/_VisualDVM/Passes/All/PublishSapforSettingsCommand.java
+++ b/src/_VisualDVM/Passes/All/PublishSapforSettingsCommand.java
@@ -3,6 +3,7 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.PublishServerObject;
 import _VisualDVM.TestingSystem.Common.TestingServer;
+import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
 public class PublishSapforSettingsCommand extends PublishServerObject<TestingServer, SapforSettingsCommand> {
     public PublishSapforSettingsCommand() {
@@ -10,11 +11,11 @@ public class PublishSapforSettingsCommand extends PublishServerObject<TestingSer
     }
     @Override
     public boolean fillObjectFields() throws Exception {
-        target.sapforsettings_id = Global.mainModule.getSapforSettings().id;
+        target.sapforsettings_id = Global.testingServer.db.getTable(SapforSettings.class).getUI().getCurrent().id;
         return super.fillObjectFields();
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        return Global.mainModule.Check(Log, Current.SapforSettings) && super.canStart(args);
+        return Global.testingServer.db.getTable(SapforSettings.class).getUI().Check(Log) && super.canStart(args);
     }
 }
diff --git a/src/_VisualDVM/Passes/All/RemoteInitialiseUser.java b/src/_VisualDVM/Passes/All/RemoteInitialiseUser.java
index 4ef16359..d7ab996f 100644
--- a/src/_VisualDVM/Passes/All/RemoteInitialiseUser.java
+++ b/src/_VisualDVM/Passes/All/RemoteInitialiseUser.java
@@ -1,10 +1,13 @@
 package _VisualDVM.Passes.All;
+import Common.MainModule_;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
+import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.Passes.SSH.ConnectionPass;
 
 import java.util.Vector;
@@ -16,12 +19,12 @@ public class RemoteInitialiseUser extends ConnectionPass<RemoteFile> {
     }
     @Override
     protected boolean canStart(Object... args) {
-        return Global.mainModule.Check(Log, Current.User);
+        return MainModule_.instance.getDb().getTable(User.class).getUI().Check(Log);
     }
     @Override
     protected void Connect() throws Exception {
-        machine = Global.mainModule.getMachine();
-        user = Global.mainModule.getUser();
+        machine = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent();
+        user = MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent();
         super.Connect();
     }
     @Override
diff --git a/src/_VisualDVM/Passes/All/ReplaceTestProject.java b/src/_VisualDVM/Passes/All/ReplaceTestProject.java
index af0c7076..e6e71d6b 100644
--- a/src/_VisualDVM/Passes/All/ReplaceTestProject.java
+++ b/src/_VisualDVM/Passes/All/ReplaceTestProject.java
@@ -34,8 +34,8 @@ public class ReplaceTestProject extends CreateTestFromProject {
     }
     @Override
     protected boolean initTarget() throws Exception {
-        if (Global.mainModule.Check(Log, Current.Test)) {
-            target = Global.mainModule.getTest();
+        if (Global.testingServer.db.tests.getUI().Check(Log)) {
+            target = Global.testingServer.db.tests.getUI().getCurrent();
             return true;
         }
         return false;
diff --git a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
index 0763094e..a1e6b4e0 100644
--- a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
+++ b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
@@ -33,9 +33,9 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
     //-
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (!Global.mainModule.Check(Log, Current.Group))
+        if (!Global.testingServer.db.groups.getUI().Check(Log))
             return false;
-        group = Global.mainModule.getGroup();
+        group = Global.testingServer.db.groups.getUI().getCurrent();
         //--->>>
         Utils.RestoreSelectedDirectory(fileChooser);
         Vector<File> files = fileChooser.ShowMultiDialog();
diff --git a/src/_VisualDVM/Passes/All/Run.java b/src/_VisualDVM/Passes/All/Run.java
index 009bd83b..6a9f19ab 100644
--- a/src/_VisualDVM/Passes/All/Run.java
+++ b/src/_VisualDVM/Passes/All/Run.java
@@ -1,12 +1,18 @@
 package _VisualDVM.Passes.All;
+import Common.MainModule_;
 import Common.Passes.Pass;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Machine.MachineType;
+import _VisualDVM.GlobalData.Makefile.Makefile;
+import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
+import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 import _VisualDVM.GlobalData.Tasks.TaskState;
+import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Project.db_project_info;
 
@@ -24,7 +30,9 @@ public class Run extends Pass<db_project_info> {
     }
     @Override
     protected void performPreparation() throws Exception {
-        runTasks = Global.mainModule.getRunConfiguration().generateRunTasks(target, Global.mainModule.getCompilationTask());
+        runTasks = MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().getCurrent().generateRunTasks(target,
+                MainModule_.instance.getDb().getTable(CompilationTask.class).getUI().getCurrent()
+        );
         for (RunTask runTask : runTasks) {
             Global.mainModule.getDb().Insert(runTask);
             Utils_.forceDeleteWithCheck(runTask.getLocalWorkspace());
@@ -37,17 +45,17 @@ public class Run extends Pass<db_project_info> {
     @Override
     protected boolean canStart(Object... args) {
         subpass = null;
-        if (Global.mainModule.Check(Log, Current.Project, Current.Machine, Current.User, Current.Makefile, Current.RunConfiguration,
-                Current.CompilationTask)) {
+        if ((Global.mainModule.Check(Log, Current.Project))&&
+                MainModule_.instance.getDb().Check(Log,Machine.class, User.class, Makefile.class, RunConfiguration.class,CompilationTask.class)) {
             //-
             target = Global.mainModule.getProject();
             //-
-            if (Global.mainModule.getMachine().type.equals(MachineType.MVS_cluster) &&
-                    Global.mainModule.getRunConfiguration().LauncherCall.isEmpty()
+            if (MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().type.equals(MachineType.MVS_cluster) &&
+                    MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().getCurrent().LauncherCall.isEmpty()
             ) {
                 Log.Writeln_("Запуск напрямую на кластере запрещён.Используйте для запуска DVM систему или MPI");
             }
-            if (!Global.mainModule.getCompilationTask().state.equals(TaskState.Done))
+            if (!MainModule_.instance.getDb().getTable(CompilationTask.class).getUI().getCurrent().state.equals(TaskState.Done))
                 Log.Writeln_("Текущая задача на компиляцию еще не выполнялась, или была завершена с ошибками");
             return Log.isEmpty();
         }
@@ -55,7 +63,7 @@ public class Run extends Pass<db_project_info> {
     }
     @Override
     protected void body() throws Exception {
-        switch (Global.mainModule.getMachine().type) {
+        switch (MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().type) {
             case Local:
                 if (Utils_.isWindows()) {
                     subpass = Global.mainModule.getPass(PassCode.WindowsLocalRun);
@@ -64,7 +72,9 @@ public class Run extends Pass<db_project_info> {
                 break;
             case Undefined:
             case MVS_cluster:
-                throw new PassException("Запуск не реализован для типа машины " + Utils_.DQuotes(Global.mainModule.getMachine().type));
+                throw new PassException("Запуск не реализован для типа машины "
+                        + Utils_.DQuotes(
+                        MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().type));
                 /*
             case MVS_cluster:
                 subpass = passes.get(PassCode_2021.MVSRun);
@@ -81,7 +91,7 @@ public class Run extends Pass<db_project_info> {
             boolean task_completed = false;
             task.setProgress(i, runTasks.size());
             //-
-            Global.mainModule.getDb().runTasks.getUI().Refresh();
+            Global.mainModule.getDb().runTasks.getUI().RedrawControl();
             Global.mainModule.getDb().runTasks.getUI().SetCurrentByPK(task.id);
             //-
             subpass.Do(task, target);
@@ -102,7 +112,7 @@ public class Run extends Pass<db_project_info> {
                     break;
             }
             //-
-            Global.mainModule.getDb().runTasks.getUI().Refresh();
+            Global.mainModule.getDb().runTasks.getUI().RedrawControl();
             Global.mainModule.getUI().getDebugWindow().ShowCurrentRunTask();
             //-
             if (!task_completed) break;
diff --git a/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java b/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java
index b6a37a87..cf79d375 100644
--- a/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java
+++ b/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java
@@ -22,8 +22,10 @@ public class SPF_ModifyArrayDistribution extends SapforModification {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         region = null;
-        if (Global.mainModule.Check(Log, Current.ParallelRegion) && super.canStart(args) && Global.mainModule.getPass(PassCode.SPF_GetArrayLinks).Do()) {
-            region = Global.mainModule.getParallelRegion();
+        if (
+                Global.mainModule.getProject().parallelRegions.getUI().Check(Log)
+                        && super.canStart(args) && Global.mainModule.getPass(PassCode.SPF_GetArrayLinks).Do()) {
+            region =  Global.mainModule.getProject().parallelRegions.getUI().getCurrent();
             DBObjectDialog dialog = new DBObjectDialog<ParallelRegion, ParallelRegionFields>(ParallelRegionFields.class) {
                 @Override
                 public int getDefaultHeight() {
diff --git a/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java b/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java
index 8554bc47..8f24fc6b 100644
--- a/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java
+++ b/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java
@@ -12,9 +12,9 @@ public class SaveBugReportExecutor extends UpdateBugReportField {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        return (Global.mainModule.Check(Log, Current.Subscriber)) &&
-                super.canStart("executor", Global.mainModule.getSubscriber().name,
-                        "executor_address", Global.mainModule.getSubscriber().address
+        return  Global.componentsServer.db.subscribers.getUI().Check(Log) &&
+                super.canStart("executor",Global.componentsServer.db.subscribers.getUI().getCurrent().name,
+                        "executor_address", Global.componentsServer.db.subscribers.getUI().getCurrent().address
                 );
     }
 }
diff --git a/src/_VisualDVM/Passes/All/SaveCurrentDVMConfiguration.java b/src/_VisualDVM/Passes/All/SaveCurrentDVMConfiguration.java
index fc3b8e33..cd298984 100644
--- a/src/_VisualDVM/Passes/All/SaveCurrentDVMConfiguration.java
+++ b/src/_VisualDVM/Passes/All/SaveCurrentDVMConfiguration.java
@@ -8,7 +8,7 @@ public class SaveCurrentDVMConfiguration extends SaveCurrentConfiguration<DVMCon
         super(DVMConfiguration.class, DVMSettings.class);
     }
     @Override
-    public Current currentName() {
-        return Current.DVMConfiguration;
+    protected Class currentClass() {
+        return DVMConfiguration.class;
     }
 }
diff --git a/src/_VisualDVM/Passes/All/SaveCurrentSAPFORConfiguration.java b/src/_VisualDVM/Passes/All/SaveCurrentSAPFORConfiguration.java
index 919944ed..2e1add81 100644
--- a/src/_VisualDVM/Passes/All/SaveCurrentSAPFORConfiguration.java
+++ b/src/_VisualDVM/Passes/All/SaveCurrentSAPFORConfiguration.java
@@ -8,8 +8,8 @@ public class SaveCurrentSAPFORConfiguration extends SaveCurrentConfiguration<Sap
         super(SapforConfiguration.class, SapforSettings.class);
     }
     @Override
-    public Current currentName() {
-        return Current.SapforConfiguration;
+    protected Class currentClass() {
+        return SapforConfiguration.class;
     }
 }
 
diff --git a/src/_VisualDVM/Passes/All/SelectRemoteFile.java b/src/_VisualDVM/Passes/All/SelectRemoteFile.java
index 58148076..da7b81c9 100644
--- a/src/_VisualDVM/Passes/All/SelectRemoteFile.java
+++ b/src/_VisualDVM/Passes/All/SelectRemoteFile.java
@@ -1,13 +1,15 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
+import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.Passes.SSH.CurrentConnectionPass;
 public class SelectRemoteFile extends CurrentConnectionPass {
     boolean dialogOK;
     boolean needs_directory = false;
     @Override
     protected boolean canStart(Object... args) {
-        if (Global.mainModule.Check(Log, Current.Machine, Current.User)) {
+        if (Global.mainModule.getDb().Check(Log, Machine.class, User.class)) {
             needs_directory = (boolean) args[0];
             Global.mainModule.set(Current.RemoteFile, null);
             return true;
diff --git a/src/_VisualDVM/Passes/All/SendBugReport.java b/src/_VisualDVM/Passes/All/SendBugReport.java
index ec9f902d..9a1ba31d 100644
--- a/src/_VisualDVM/Passes/All/SendBugReport.java
+++ b/src/_VisualDVM/Passes/All/SendBugReport.java
@@ -2,24 +2,26 @@ package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
+import _VisualDVM.Repository.BugReport.BugReport;
 import _VisualDVM.Repository.BugReport.BugReportState;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
-public class SendBugReport extends ComponentsRepositoryPass {
+public class SendBugReport extends ComponentsRepositoryPass<BugReport> {
     @Override
     protected void ServerAction() throws Exception {
-        if (!Global.mainModule.getBugReport().project_version.isEmpty()) {
+        target = Global.componentsServer.db.bugReports.getUI().getCurrent();
+        if (!target.project_version.isEmpty()) {
             //отправить архив.
             Command(new ServerExchangeUnit_2021(ServerCode.SendBugReport,
-                    Global.mainModule.getBugReport().id,
-                    Utils_.fileToBytes(Global.mainModule.getBugReport().getArchiveFile())
+                    target.id,
+                    Utils_.fileToBytes(target.getArchiveFile())
             ));
         }
         // синхрон бд
-        Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", Global.mainModule.getBugReport()));
+        Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", target));
     }
     @Override
     protected void performFail() throws Exception {
-        Global.mainModule.getBugReport().state = BugReportState.draft;
+        target.state = BugReportState.draft;
     }
 }
diff --git a/src/_VisualDVM/Passes/All/ShowCompilerHelp.java b/src/_VisualDVM/Passes/All/ShowCompilerHelp.java
index f0b170af..ad885c62 100644
--- a/src/_VisualDVM/Passes/All/ShowCompilerHelp.java
+++ b/src/_VisualDVM/Passes/All/ShowCompilerHelp.java
@@ -1,8 +1,10 @@
 package _VisualDVM.Passes.All;
+import Common.MainModule_;
 import Common.Passes.Pass;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.Compiler;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Machine.MachineType;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
@@ -23,8 +25,8 @@ public class ShowCompilerHelp extends Pass<String> {
     protected boolean canStart(Object... args) throws Exception {
         target = null;
         if (args.length == 0) {
-            if (Global.mainModule.Check(Log, Current.Compiler)) {
-                compiler = Global.mainModule.getCompiler();
+            if (MainModule_.instance.getDb().getTable(Compiler.class).getUI().Check(Log)) {
+                compiler = MainModule_.instance.getDb().getTable(Compiler.class).getUI().getCurrent();
                 needsShow = true;
                 return true;
             }
@@ -39,7 +41,7 @@ public class ShowCompilerHelp extends Pass<String> {
     protected void body() throws Exception {
         subpass = null;
         compiler.ResetHelp();
-        if (Global.mainModule.getMachine().type.equals(MachineType.Local)) {
+        if (MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().type.equals(MachineType.Local)) {
             subpass = Global.mainModule.getPass(PassCode.LocalSingleCommand);
         } else {
             subpass = Global.mainModule.getPass(PassCode.RemoteSingleCommand);
diff --git a/src/_VisualDVM/Passes/All/ShowCompilerVersion.java b/src/_VisualDVM/Passes/All/ShowCompilerVersion.java
index ff122b40..d4537552 100644
--- a/src/_VisualDVM/Passes/All/ShowCompilerVersion.java
+++ b/src/_VisualDVM/Passes/All/ShowCompilerVersion.java
@@ -1,8 +1,9 @@
 package _VisualDVM.Passes.All;
+import Common.MainModule_;
 import Common.Passes.Pass;
-import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.Compiler;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Machine.MachineType;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
@@ -23,8 +24,8 @@ public class ShowCompilerVersion extends Pass<String> {
     protected boolean canStart(Object... args) throws Exception {
         target = null;
         if (args.length == 0) {
-            if (Global.mainModule.Check(Log, Current.Compiler)) {
-                compiler = Global.mainModule.getCompiler();
+            if (MainModule_.instance.getDb().getTable(Compiler.class).getUI().Check(Log)) {
+                compiler = MainModule_.instance.getDb().getTable(Compiler.class).getUI().getCurrent();
                 needsShow = true;
                 return true;
             }
@@ -39,7 +40,7 @@ public class ShowCompilerVersion extends Pass<String> {
     protected void body() throws Exception {
         subpass = null;
         compiler.ResetVersion();
-        if (Global.mainModule.getMachine().type.equals(MachineType.Local)) {
+        if (MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().type.equals(MachineType.Local)) {
             subpass = Global.mainModule.getPass(PassCode.LocalSingleCommand);
         } else {
             subpass = Global.mainModule.getPass(PassCode.RemoteSingleCommand);
@@ -59,7 +60,7 @@ public class ShowCompilerVersion extends Pass<String> {
     @Override
     protected void showDone() throws Exception {
         if (needsShow) {
-            (Global.mainModule.getDb()).compilers.getUI().Refresh();
+            (Global.mainModule.getDb()).compilers.RefreshUI();
             ReadOnlyMultilineTextForm ff = new ReadOnlyMultilineTextForm();
             ff.ShowDialog("Версия", target);
         }
diff --git a/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java b/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java
index 9c7e0eec..2a63ad09 100644
--- a/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java
+++ b/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java
@@ -25,8 +25,8 @@ public class ShowComponentChangesLog extends ComponentsRepositoryPass<Component>
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (Global.mainModule.Check(Log, Current.Component)) {
-            target = Global.mainModule.getComponent();
+        if (Global.components.getUI().Check(Log)) {
+            target = Global.components.getUI().getCurrent();
             return true;
         }
         return false;
diff --git a/src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java b/src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java
index c7857aa4..48ef308f 100644
--- a/src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java
+++ b/src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java
@@ -10,8 +10,8 @@ import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
 import java.util.Vector;
 public class ShowCurrentDVMConfigurationTests extends ShowCurrentConfigurationTests<DVMConfiguration> {
     @Override
-    public Current currentName() {
-        return Current.DVMConfiguration;
+    public Class currentClass() {
+        return DVMConfiguration.class;
     }
     @Override
     protected void showDone() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java b/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java
index fa2d1940..ea3d88f0 100644
--- a/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java
+++ b/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java
@@ -10,8 +10,8 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import java.util.Vector;
 public class ShowCurrentSAPFORConfigurationTests extends ShowCurrentConfigurationTests<SapforConfiguration> {
     @Override
-    public Current currentName() {
-        return Current.SapforConfiguration;
+    public Class currentClass() {
+        return SapforConfiguration.class;
     }
     @Override
     protected void showDone() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/ShowMakefilePreview.java b/src/_VisualDVM/Passes/All/ShowMakefilePreview.java
index 624730c7..969b6542 100644
--- a/src/_VisualDVM/Passes/All/ShowMakefilePreview.java
+++ b/src/_VisualDVM/Passes/All/ShowMakefilePreview.java
@@ -1,7 +1,9 @@
 package _VisualDVM.Passes.All;
+import Common.MainModule_;
 import Common.Passes.Pass;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Makefile.Makefile;
 import _VisualDVM.GlobalData.Makefile.UI.MakefilePreviewForm;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Project.db_project_info;
@@ -20,7 +22,7 @@ public class ShowMakefilePreview extends Pass<db_project_info> {
     }
     @Override
     protected boolean canStart(Object... args) {
-        if (Global.mainModule.Check(Log, Current.Project, Current.Makefile)) {
+        if (Global.mainModule.Check(Log, Current.Project) &&MainModule_.instance.getDb().getTable(Makefile.class).getUI().Check(Log) ) {
             target = Global.mainModule.getProject();
             return true;
         }
@@ -29,6 +31,6 @@ public class ShowMakefilePreview extends Pass<db_project_info> {
     @Override
     protected void body() throws Exception {
         new MakefilePreviewForm().ShowDialog("Предпросмотр мейкфайла для текущего проекта",
-                Global.mainModule.getMakefile().Generate(target));
+                MainModule_.instance.getDb().getTable(Makefile.class).getUI().getCurrent().Generate(target));
     }
 }
diff --git a/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java b/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java
index aa822a26..39651ca8 100644
--- a/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java
+++ b/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java
@@ -18,9 +18,10 @@ public class ShowSapforCompilationErr extends ShowTestingServerFile {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (!Global.mainModule.Check(Log, Current.ServerSapfor)) {
+        if (!Global.testingServer.db.serverSapfors.getUI().Check(Log)) {
             return false;
         }
-        return super.canStart("Поток ошибок", new RemoteFile(Global.mainModule.getServerSapfor().home_path, Constants.err_file));
+        return super.canStart("Поток ошибок", new RemoteFile(
+                Global.testingServer.db.serverSapfors.getUI().getCurrent().home_path, Constants.err_file));
     }
 }
diff --git a/src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java b/src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java
index 4f62f578..292b87d8 100644
--- a/src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java
+++ b/src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java
@@ -18,9 +18,10 @@ public class ShowSapforCompilationOut extends ShowTestingServerFile {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (!Global.mainModule.Check(Log, Current.ServerSapfor)) {
+        if (!Global.testingServer.db.serverSapfors.getUI().Check(Log)) {
             return false;
         }
-        return super.canStart("Поток вывода", new RemoteFile(Global.mainModule.getServerSapfor().home_path, Constants.out_file));
+        return super.canStart("Поток вывода", new RemoteFile(
+                Global.testingServer.db.serverSapfors.getUI().getCurrent().home_path, Constants.out_file));
     }
 }
diff --git a/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java b/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java
index 1fbe7705..4e9dfe2f 100644
--- a/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java
+++ b/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java
@@ -1,9 +1,12 @@
 package _VisualDVM.Passes.All;
+import Common.MainModule_;
 import Common.Visual.UI;
-import _VisualDVM.Current;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.Compiler.CompilerType;
+import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Machine.MachineType;
+import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.GlobalData.User.UserState;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.PublishServerObject;
@@ -26,22 +29,27 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
         if (!Global.mainModule.getAccount().CheckRegistered(Log)) {
             return false;
         }
-        if (!Global.mainModule.Check(Log, Current.Machine, Current.User, Current.Compiler))
+        if (!MainModule_.instance.getDb().Check(Log, Machine.class, User.class, Compiler.class))
             return false;
-        if (!Global.mainModule.getMachine().type.equals(MachineType.Server)) {
+        //--
+        Machine machine = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent();
+        User user = MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent();
+        Compiler compiler = MainModule_.instance.getDb().getTable(Compiler.class).getUI().getCurrent();
+        //--
+        if (!machine.type.equals(MachineType.Server)) {
             Log.Writeln_("Тестирование поддерживается только на одиночном удалённом сервере.");
             return false;
         }
-        if (!Global.mainModule.getUser().state.equals(UserState.ready_to_work)) {
+        if (!user.state.equals(UserState.ready_to_work)) {
             Log.Writeln_("Пользователь не готов к работе. Выполните инициализацию пользователя!");
             return false;
         }
-        if (!Global.mainModule.getCompiler().type.equals(CompilerType.dvm)) {
+        if (!compiler.type.equals(CompilerType.dvm)) {
             Log.Writeln_("Тестирование поддерживается только для DVM компиляторов.");
             return false;
         }
-        if (!Global.mainModule.getCompiler().versionLoaded)
-            Global.mainModule.getPass(PassCode.ShowCompilerVersion).Do(Global.mainModule.getCompiler(), false);
+        if (!compiler.versionLoaded)
+            Global.mainModule.getPass(PassCode.ShowCompilerVersion).Do(compiler, false);
         //-----
         if (!Global.testingServer.db.dvm_configurations.getUI().CheckSelectedOrCurrent(Log)) {
             return false;
@@ -50,9 +58,9 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
         //---
         target = new DVMPackage(
                 Global.mainModule.getAccount(),
-                Global.mainModule.getMachine(),
-                Global.mainModule.getUser(),
-                Global.mainModule.getCompiler(),
+                machine,
+                user,
+                compiler,
                 configurations,
                 Global.properties.EmailOnTestingProgress ? 1 : 0
         );
diff --git a/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java b/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java
index 4242377a..b3a53794 100644
--- a/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java
+++ b/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java
@@ -27,10 +27,10 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
         if (!Global.mainModule.getAccount().CheckRegistered(Log)) {
             return false;
         }
-        if (!Global.mainModule.Check(Log, Current.ServerSapfor)) {
+        if (!Global.testingServer.db.serverSapfors.getUI().Check(Log)) {
             return false;
         }
-        if (!Global.mainModule.getServerSapfor().state.equals(ServerSapforState.Done)) {
+        if (!Global.testingServer.db.serverSapfors.getUI().getCurrent().state.equals(ServerSapforState.Done)) {
             Log.Writeln_("Выбранная версия SAPFOR не собрана!");
             return false;
         }
@@ -40,7 +40,7 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
         }
         configurations = Global.testingServer.db.sapforConfigurations.getUI().getSelectedOrCurrent();
         target = new SapforPackage(Global.mainModule.getAccount(),
-                Global.mainModule.getServerSapfor(),
+                Global.testingServer.db.serverSapfors.getUI().getCurrent(),
                 configurations,
                 Global.properties.EmailOnTestingProgress ? 1 : 0,
                 Log);
diff --git a/src/_VisualDVM/Passes/All/UpdateBugReportField.java b/src/_VisualDVM/Passes/All/UpdateBugReportField.java
index 3e4c9d57..c5166449 100644
--- a/src/_VisualDVM/Passes/All/UpdateBugReportField.java
+++ b/src/_VisualDVM/Passes/All/UpdateBugReportField.java
@@ -1,6 +1,5 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
-import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
@@ -25,12 +24,12 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (!Global.mainModule.Check(Log, Current.BugReport))
+        if  (!Global.componentsServer.db.bugReports.getUI().Check(Log))
             return false;
         old_description = "";
         old_comment = "";
         //--
-        target = Global.mainModule.getBugReport();
+        target = Global.componentsServer.db.bugReports.getUI().getCurrent();
         fieldNames.clear();
         fieldValues.clear();
         for (int i = 0; i < args.length; ++i) {
@@ -51,7 +50,7 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
                 BugReport.class.getField(fieldNames.get(i)).set(target, fieldValues.get(i));
             target.change_date = new Date().getTime();
             server.db.Update(target);
-            server.db.bugReports.getUI().Refresh();
+            server.db.bugReports.RefreshUI();
             Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
         } else
             return canUpdate();
@@ -83,7 +82,7 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
     }
     @Override
     protected void showFinish() throws Exception {
-        Global.componentsServer.db.bugReports.getUI().Refresh();
+        Global.componentsServer.db.bugReports.RefreshUI();
         Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
     }
     @Override
diff --git a/src/_VisualDVM/Passes/All/UpdateBugReportProgress.java b/src/_VisualDVM/Passes/All/UpdateBugReportProgress.java
index 3f3f594a..eb7baacf 100644
--- a/src/_VisualDVM/Passes/All/UpdateBugReportProgress.java
+++ b/src/_VisualDVM/Passes/All/UpdateBugReportProgress.java
@@ -13,10 +13,11 @@ public class UpdateBugReportProgress extends UpdateBugReportField {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (!Global.mainModule.Check(Log, Current.BugReport))
+        if (!Global.componentsServer.db.bugReports.getUI().Check(Log))
             return false;
         PercentsForm f = new PercentsForm();
-        if (f.ShowDialog("Завершённость работы над ошибкой", Global.mainModule.getBugReport().percentage))
+        if (f.ShowDialog("Завершённость работы над ошибкой",
+                Global.componentsServer.db.bugReports.getUI().getCurrent().percentage))
             return super.canStart("percentage", f.Result);
         return false;
     }
diff --git a/src/_VisualDVM/Passes/All/UpdateComponent.java b/src/_VisualDVM/Passes/All/UpdateComponent.java
index dc1e760f..415162cf 100644
--- a/src/_VisualDVM/Passes/All/UpdateComponent.java
+++ b/src/_VisualDVM/Passes/All/UpdateComponent.java
@@ -16,9 +16,10 @@ public class UpdateComponent extends Pass<Component> {
     }
     @Override
     protected void body() throws Exception {
+        target = Global.components.getUI().getCurrent();
         PassCode subPassCode = null;
         //<editor-fold desc="получение нового файла компонента">
-        switch (Global.mainModule.getComponent().getComponentType()) {
+        switch (target.getComponentType()) {
             case Sapfor_F:
             case Visualizer_2:
                 subPassCode = Utils_.isWindows() ? PassCode.DownloadComponent : PassCode.BuildComponent;
@@ -31,15 +32,15 @@ public class UpdateComponent extends Pass<Component> {
         }
         if ((subPassCode != null) && Global.mainModule.getPass(subPassCode).Do()) {
             //</editor-fold>
-            if (!Global.mainModule.getComponent().getNewFile().exists())
-                throw new PassException("Не удалось получить новый файл для компонента " + Global.mainModule.getComponent().getComponentType().getDescription());
+            if (!target.getNewFile().exists())
+                throw new PassException("Не удалось получить новый файл для компонента " + target.getComponentType().getDescription());
             //непосредственное обновление.
-            Global.mainModule.getComponent().Update();
+            target.Update();
         }
     }
     @Override
     protected void performFinish() throws Exception {
-        Global.mainModule.getComponent().CheckIfNeedsUpdateOrPublish();
+        target.CheckIfNeedsUpdateOrPublish();
     }
     @Override
     protected void showDone() throws Exception {
diff --git a/src/_VisualDVM/Passes/CurrentComponentPass.java b/src/_VisualDVM/Passes/CurrentComponentPass.java
index 29ec57a3..29700bdf 100644
--- a/src/_VisualDVM/Passes/CurrentComponentPass.java
+++ b/src/_VisualDVM/Passes/CurrentComponentPass.java
@@ -6,8 +6,8 @@ import _VisualDVM.Repository.Component.Component;
 public abstract class CurrentComponentPass extends Pass<Component> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (Global.mainModule.Check(Log, Current.Component)) {
-            target = Global.mainModule.getComponent();
+        if (Global.components.getUI().Check(Log)) {
+            target = Global.components.getUI().getCurrent();
             return true;
         }
         return false;
diff --git a/src/_VisualDVM/Passes/SSH/CurrentConnectionPass.java b/src/_VisualDVM/Passes/SSH/CurrentConnectionPass.java
index 38d04012..1faff157 100644
--- a/src/_VisualDVM/Passes/SSH/CurrentConnectionPass.java
+++ b/src/_VisualDVM/Passes/SSH/CurrentConnectionPass.java
@@ -1,6 +1,8 @@
 package _VisualDVM.Passes.SSH;
-import _VisualDVM.Current;
+import Common.MainModule_;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
+import _VisualDVM.GlobalData.User.User;
 //завязан на текущие машину и юзера
 public abstract class CurrentConnectionPass<T> extends ConnectionPass<T> {
     @Override
@@ -9,12 +11,12 @@ public abstract class CurrentConnectionPass<T> extends ConnectionPass<T> {
     }
     @Override
     protected boolean canStart(Object... args) {
-        return Global.mainModule.Check(Log, Current.User);
+        return MainModule_.instance.getDb().getTable(User.class).getUI().Check(Log);
     }
     @Override
     public void Connect() throws Exception {
-        machine = Global.mainModule.getMachine();
-        user = Global.mainModule.getUser();
+        machine = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent();
+        user = MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent();
         super.Connect();
     }
 }
diff --git a/src/_VisualDVM/Passes/Server/CloneServerObject.java b/src/_VisualDVM/Passes/Server/CloneServerObject.java
index ec43fdae..5bb18b47 100644
--- a/src/_VisualDVM/Passes/Server/CloneServerObject.java
+++ b/src/_VisualDVM/Passes/Server/CloneServerObject.java
@@ -1,6 +1,5 @@
 package _VisualDVM.Passes.Server;
 import Common.Database.Objects.riDBObject;
-import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Repository.RepositoryServer;
 public abstract class CloneServerObject<S extends RepositoryServer, D extends riDBObject> extends PublishServerObject<S, D> {
@@ -16,17 +15,17 @@ public abstract class CloneServerObject<S extends RepositoryServer, D extends ri
     public String getDescription_() {
         return "дублирование";
     }
-    protected abstract Current currentName();
+    protected abstract Class currentClass();
     @Override
     protected boolean canStart(Object... args) throws Exception {
         src = null;
-        if (!Global.mainModule.Check(Log, currentName()))
+        if (!server.db.getTable(currentClass()).getUI().Check(Log))
             return false;
         //---------
         pk = null;
         if (Global.mainModule.getAccount().CheckRegistered(Log)) {
             target = d.newInstance();
-            target.SynchronizeFields(src = (D) Global.mainModule.get(currentName()));
+            target.SynchronizeFields(src = (D) server.db.getTable(currentClass()).getUI().getCurrent());
             //единственное отличие клона - текущий автор
             target.description += " копия";
             target.sender_name = Global.mainModule.getAccount().name;
diff --git a/src/_VisualDVM/Passes/Server/DeleteServerObject.java b/src/_VisualDVM/Passes/Server/DeleteServerObject.java
index e2ce515a..cdc812d1 100644
--- a/src/_VisualDVM/Passes/Server/DeleteServerObject.java
+++ b/src/_VisualDVM/Passes/Server/DeleteServerObject.java
@@ -16,7 +16,7 @@ public class DeleteServerObject<S extends RepositoryServer, D extends DBObject>
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = (D) getDb().getTable(d).getUI().getCurrent();
-        return getDb().getTable(d).getUI().CheckCurrent(Log) && getDb().getTable(d).getUI().ShowDeleteObjectDialog(target);
+        return getDb().getTable(d).getUI().Check(Log) && getDb().getTable(d).getUI().ShowDeleteObjectDialog(target);
     }
     //Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
     @Override
diff --git a/src/_VisualDVM/Passes/Server/EditServerObject.java b/src/_VisualDVM/Passes/Server/EditServerObject.java
index 756001f2..e6cb5bdf 100644
--- a/src/_VisualDVM/Passes/Server/EditServerObject.java
+++ b/src/_VisualDVM/Passes/Server/EditServerObject.java
@@ -19,7 +19,7 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = (D) getDb().getTable(d).getUI().getCurrent();
-        return getDb().getTable(d).getUI().CheckCurrent(Log) && getDb().getTable(d).getUI().ShowEditObjectDialog(target);
+        return getDb().getTable(d).getUI().Check(Log) && getDb().getTable(d).getUI().ShowEditObjectDialog(target);
     }
     //--
     @Override
diff --git a/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java b/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java
index d63dbc37..39bb27ae 100644
--- a/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java
+++ b/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java
@@ -1,5 +1,4 @@
 package _VisualDVM.Passes.Testing;
-import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.TestingSystemPass;
 import _VisualDVM.Repository.Server.ServerCode;
@@ -16,13 +15,13 @@ public abstract class AbortTestingPackage extends TestingSystemPass<TestingPacka
     public String getButtonText() {
         return "";
     }
-    public abstract Current currentName();
+    public abstract Class currentClass();
     public abstract int getAbortType();
     @Override
     protected boolean canStart(Object... args) throws Exception {
         packageToKill = null;
-        if (Global.mainModule.Check(Log, currentName())) {
-            target = (TestingPackage) Global.mainModule.get(currentName());
+        if (server.db.Check(Log, currentClass())) {
+            target = (TestingPackage) server.db.getTable(currentClass()).getUI().getCurrent();
             switch (target.state) {
                 case Done:
                 case Aborted:
diff --git a/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java b/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
index de573794..1f62cd79 100644
--- a/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
+++ b/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
@@ -45,6 +45,6 @@ public abstract class ActualizeTestingPackages<P extends TestingPackage> extends
     }
     @Override
     protected void showDone() throws Exception {
-        getTable().getUI().Refresh();
+        getTable().getUI().RedrawControl();
     }
 }
diff --git a/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java b/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java
index bdebf622..3f7c4f07 100644
--- a/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java
+++ b/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java
@@ -1,5 +1,4 @@
 package _VisualDVM.Passes.Testing;
-import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.EditServerObject;
 import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
@@ -27,11 +26,11 @@ public abstract class SaveCurrentConfiguration<C extends Configuration, S extend
     public String getDescription_() {
         return "сохранение тестов и параметров";
     }
-    public abstract Current currentName();
+    protected abstract Class currentClass();
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (!Global.mainModule.Check(Log, currentName())) return false;
-        target = (C) Global.mainModule.get(currentName());
+        if (!Global.testingServer.db.getTable(currentClass()).getUI().Check(Log)) return false;
+        target = (C) Global.testingServer.db.getTable(currentClass()).getUI().getCurrent();
         //--
         groups = new Vector<>();
         tests = new Vector<>();
diff --git a/src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java b/src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java
index 6c2e2a15..ecc6157e 100644
--- a/src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java
+++ b/src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java
@@ -1,6 +1,5 @@
 package _VisualDVM.Passes.Testing;
 import Common.Passes.Pass;
-import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
@@ -18,12 +17,12 @@ public abstract class ShowCurrentConfigurationTests<C extends Configuration> ext
     public String getButtonText() {
         return "";
     }
-    public abstract Current currentName();
+    public abstract Class currentClass();
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = null;
-        if (Global.mainModule.Check(Log, currentName())) {
-            target = (C) Global.mainModule.get(currentName());
+        if (Global.testingServer.db.getTable(currentClass()).getUI().Check(Log)) {
+            target = (C) (Global.testingServer.db.getTable(currentClass()).getUI().getCurrent());
             return true;
         }
         return false;
diff --git a/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java b/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
index 6c50e984..37463257 100644
--- a/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
+++ b/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
@@ -11,8 +11,8 @@ public class DBArraysForm extends DataSetControlForm<DBArray> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.DBArray;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     public String[] getUIColumnNames() {
diff --git a/src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java b/src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java
index 0424cb53..a8ecfc5e 100644
--- a/src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java
+++ b/src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java
@@ -9,13 +9,4 @@ public class ErrorsDBTable extends MessagesDBTable<MessageError> {
     public ErrorsDBTable() {
         super(MessageError.class);
     }
-    @Override
-    protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new MessagesControlForm(this, mountPanel) {
-            @Override
-            protected Current CurrentName() {
-                return Current.Errors;
-            }
-        };
-    }
 }
diff --git a/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java b/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
index 54dd5f80..b13c1389 100644
--- a/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
+++ b/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
@@ -14,6 +14,10 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
+    protected boolean needsCurrent() {
+        return true;
+    }
+    @Override
     public String[] getUIColumnNames() {
         return new String[]{
                 "группа",
diff --git a/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java b/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
index d3cb04b6..f7a8333d 100644
--- a/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
+++ b/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
@@ -1,5 +1,8 @@
 package _VisualDVM.ProjectData.Messages;
 import Common.Database.Tables.iDBTable;
+import Common.Visual.DataSetControlForm;
+
+import javax.swing.*;
 //https://stackoverflow.com/questions/2026965/can-i-add-a-button-to-a-jtable-column-header
 //https://stackoverflow.com/questions/7137786/how-can-i-put-a-control-in-the-jtableheader-of-a-jtable/29963916#29963916
 //https://stackoverflow.com/questions/7137786/how-can-i-put-a-control-in-the-jtableheader-of-a-jtable   ->>
@@ -7,4 +10,9 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
     public MessagesDBTable(Class<M> d_in) {
         super(d_in);
     }
+    @Override
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new MessagesControlForm(this, mountPanel);
+    }
+
 }
diff --git a/src/_VisualDVM/ProjectData/Messages/Notes/NotesDBTable.java b/src/_VisualDVM/ProjectData/Messages/Notes/NotesDBTable.java
index 83cd636e..26c6844b 100644
--- a/src/_VisualDVM/ProjectData/Messages/Notes/NotesDBTable.java
+++ b/src/_VisualDVM/ProjectData/Messages/Notes/NotesDBTable.java
@@ -9,13 +9,4 @@ public class NotesDBTable extends MessagesDBTable<MessageNote> {
     public NotesDBTable() {
         super(MessageNote.class);
     }
-    @Override
-    protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new MessagesControlForm(this, mountPanel) {
-            @Override
-            protected Current CurrentName() {
-                return Current.Notes;
-            }
-        };
-    }
 }
diff --git a/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java b/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java
index 6844538e..cb773ae7 100644
--- a/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java
+++ b/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java
@@ -12,8 +12,8 @@ public class RecommendationsForm extends DataSetControlForm<MessageRecommendatio
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.Recommendations;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     public String[] getUIColumnNames() {
diff --git a/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java b/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java
index faf6f661..bbf28295 100644
--- a/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java
+++ b/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java
@@ -10,13 +10,4 @@ public class WarningsDBTable extends MessagesDBTable<MessageWarning> {
     public WarningsDBTable() {
         super(MessageWarning.class);
     }
-    @Override
-    protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new MessagesControlForm(this, mountPanel) {
-            @Override
-            protected Current CurrentName() {
-                return Current.Warnings;
-            }
-        };
-    }
 }
\ No newline at end of file
diff --git a/src/_VisualDVM/ProjectData/Project/db_project_info.java b/src/_VisualDVM/ProjectData/Project/db_project_info.java
index 358106da..bd33019b 100644
--- a/src/_VisualDVM/ProjectData/Project/db_project_info.java
+++ b/src/_VisualDVM/ProjectData/Project/db_project_info.java
@@ -1,6 +1,7 @@
 package _VisualDVM.ProjectData.Project;
 import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
+import Common.MainModule_;
 import Common.Passes.PassException;
 import Common.Utils.Index;
 import Common.Utils.TextLog;
@@ -1078,7 +1079,7 @@ public class db_project_info extends DBObject {
         target.Close();
     }
     public void undoLastTransformation() throws Exception {
-        Global.mainModule.set(Current.Version, null);
+        MainModule_.instance.set(Current.Version, null); //?
         //---
         Global.mainModule.getUI().getVersionsWindow().getVersionsForm().getTree().RemoveNode(last_version.node);
         Utils_.forceDeleteWithCheck(last_version.Home);
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
index 8f60027d..c7ef998c 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
@@ -24,9 +24,10 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
         super(dataSource_in, mountPanel_in);
     }
     //--
+
     @Override
-    protected Current CurrentName() {
-        return Current.ProjectArray;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     public String[] getUIColumnNames() {
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java
index 03db5dcd..d99be1ab 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java
@@ -13,7 +13,7 @@ public class RulesTree extends StyledTree {
         setRootVisible(false);
         expandRow(0);
         ExpandAll();
-        Global.mainModule.set(Current.ParallelRegion, null);
+        Global.mainModule.getProject().parallelRegions.getUI().dropCurrent();
     }
     @Override
     protected GraphMenu createMenu() {
@@ -36,6 +36,7 @@ public class RulesTree extends StyledTree {
                 region = (ParallelRegion) o;
             }
         }
-        Global.mainModule.set(Current.ParallelRegion, region);
+        //todo(?)
+        Global.mainModule.getProject().parallelRegions.getUI().SetCurrentByPK(region.getPK());
     }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java b/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java
index 53e9767f..9a8595ea 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java
@@ -1,7 +1,9 @@
 package _VisualDVM.ProjectData.SapforData.Regions.UI;
+import Common.MainModule_;
 import Common.Visual.Tables.StyledCellLabel;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
+import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
 import javafx.util.Pair;
 
 import javax.swing.*;
@@ -46,9 +48,10 @@ public class ArrayAlignmentBar extends JToolBar {
                         //это массивы из объявлений. прежде чем их трогать проверим а есть ли они в текущей области.
                         // по адресам принадлежность смотреть нельзя.
                         // на момент поиска массивов у них их еще нет. а вот ид совпадают.
-                        if (Global.mainModule.getParallelRegion().ArrayBelongsToRegion(d_link.id)) {
+                        ParallelRegion currentRegion = MainModule_.instance.getDb().getTable(ParallelRegion.class).getUI().getCurrent();
+                        if (currentRegion.ArrayBelongsToRegion(d_link.id)) {
                             //инфа о массиве уже из области. имеющая адрес и бар.
-                            ProjectArray r_link = Global.mainModule.getParallelRegion().getArrayById(d_link.id);
+                            ProjectArray r_link = currentRegion.getArrayById(d_link.id);
                             Pair<JSpinner, JSpinner> pair = r_link.bar.dimensions.get(dim);
                             pair.getKey().setValue(K.getValue());
                             pair.getValue().setValue(B.getValue());
diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java b/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java
index c6d9bc81..57f49634 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java
@@ -12,8 +12,8 @@ public class ParallelRegionsForm extends DataSetControlForm<ParallelRegion> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.ParallelRegionInfo;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     public String[] getUIColumnNames() {
diff --git a/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java b/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
index 1fd02d15..b5e782bc 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
@@ -14,9 +14,10 @@ public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
     public ParallelVariantsForm(DataSet<?, ParallelVariant> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
     }
+
     @Override
-    protected Current CurrentName() {
-        return Current.ParallelVariant;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
diff --git a/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java b/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
index 1f988b2e..04dd8411 100644
--- a/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
+++ b/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
@@ -31,8 +31,8 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
     }
     //--
     @Override
-    protected Current CurrentName() {
-        return Current.BugReport;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     public String[] getUIColumnNames() {
diff --git a/src/_VisualDVM/Repository/Component/ComponentsSet.java b/src/_VisualDVM/Repository/Component/ComponentsSet.java
index c348d80f..5f32e515 100644
--- a/src/_VisualDVM/Repository/Component/ComponentsSet.java
+++ b/src/_VisualDVM/Repository/Component/ComponentsSet.java
@@ -1,5 +1,6 @@
 package _VisualDVM.Repository.Component;
 import Common.Database.Tables.DataSet;
+import Common.MainModule_;
 import Common.Visual.DataSetControlForm;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
@@ -26,7 +27,7 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
     public ComponentsSet() {
         super(ComponentType.class, Component.class);
         put(ComponentType.Visualiser, visualiser = new Visualiser());
-        put(ComponentType.Sapfor_F, (Component) Global.mainModule.set(Current.Sapfor, new Sapfor_F()));
+        put(ComponentType.Sapfor_F, (Component)MainModule_.instance.set(Current.Sapfor, new Sapfor_F()));
         put(ComponentType.Visualizer_2, visualizer_2);
         put(ComponentType.PerformanceAnalyzer, performanceAnalyzer = new PerformanceAnalyzer());
         put(ComponentType.Instruction, new Instruction());
@@ -46,7 +47,7 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
     //--
     public void refreshUpdatesStatus() {
         if (getUI() != null)
-            getUI().Refresh();
+            getUI().RedrawControl();
         validateStates();
         if (Global.mainModule.getUI().hasMainWindow())
             Global.mainModule.getUI().getMainWindow().ShowUpdatesIcon();
diff --git a/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java b/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
index fa3bd50c..50c249de 100644
--- a/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
+++ b/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
@@ -19,8 +19,8 @@ public class ComponentsForm extends DataSetControlForm<Component> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.Component;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
diff --git a/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java b/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
index dd25cc60..b1c4f17b 100644
--- a/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
+++ b/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
@@ -2,10 +2,10 @@ package _VisualDVM.Repository.SubscriberWorkspace.UI;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
+import _VisualDVM.Repository.Subscribes.Subscriber;
 
 import javax.swing.*;
 public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> {
@@ -13,8 +13,8 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.SubscriberWorkspace;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     public String[] getUIColumnNames() {
@@ -41,7 +41,8 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
     }
     @Override
     public boolean isObjectVisible(SubscriberWorkspace object) {
-        return super.isObjectVisible(object) && Global.mainModule.HasSubscriber() && Global.mainModule.getSubscriber().address.equals(object.email) &&
-                (Global.mainModule.getAccount().isAdmin() || Global.mainModule.getAccount().email.equals(Global.mainModule.getSubscriber().address));
+        Subscriber subscriber = Global.componentsServer.db.subscribers.getUI().getCurrent();
+        return super.isObjectVisible(object) && (subscriber != null) && subscriber.address.equals(object.email) &&
+                (Global.mainModule.getAccount().isAdmin() || Global.mainModule.getAccount().email.equals(subscriber.address));
     }
 }
diff --git a/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java b/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
index 0734ca2c..064e7e8b 100644
--- a/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
+++ b/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
@@ -16,8 +16,8 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.Subscriber;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
@@ -46,7 +46,7 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
     protected void AdditionalInitColumns() {
         boolean admin = Global.mainModule.getAccount().role.equals(AccountRole.Admin);
         columns.get(0).setVisible(admin);
-        columns.get(1).setVisible(Global.mainModule.getBugReport() != null);
+        columns.get(1).setVisible(Global.componentsServer.db.bugReports.getUI().getCurrent() != null);
         columns.get(3).setVisible(admin);
         columns.get(4).setVisible(admin);
     }
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
index e8af6765..e43417d3 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
@@ -21,9 +21,10 @@ public class GroupsForm extends DataSetControlForm<Group> {
     public GroupsForm(DataSet<?, Group> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
     }
+
     @Override
-    protected Current CurrentName() {
-        return Current.Group;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java
index 3de4a1b7..1a477d0b 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java
@@ -1,6 +1,7 @@
 package _VisualDVM.TestingSystem.Common.Test.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Global;
+import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 public class TestDialog extends DBObjectDialog<Test, TestFields> {
     public TestDialog() {
@@ -17,8 +18,10 @@ public class TestDialog extends DBObjectDialog<Test, TestFields> {
     @Override
     public void validateFields() {
         if (!edit) {
-            if (!Global.mainModule.getGroup().language.equals(Global.mainModule.getProject().languageName))
-                Log.Writeln_("В текущую группу могут войти только тесты на языке " + Global.mainModule.getGroup().language);
+            if (! Global.testingServer.db.getTable(Group.class).getUI().getCurrent().language.equals(Global.mainModule.getProject().languageName))
+                Log.Writeln_("В текущую группу могут войти только тесты на языке "
+                        +
+                        Global.testingServer.db.getTable(Group.class).getUI().getCurrent().language);
         }
     }
     @Override
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
index 2792c6a2..72d5b1a7 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
@@ -1,11 +1,12 @@
 package _VisualDVM.TestingSystem.Common.Test.UI;
 import Common.Database.Tables.DataSet;
-import Common.MainModule_;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
+import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 
 import javax.swing.*;
@@ -13,9 +14,10 @@ public class TestsForm extends DataSetControlForm<Test> {
     public TestsForm(DataSet<?, Test> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
     }
+
     @Override
-    protected Current CurrentName() {
-        return Current.Test;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
@@ -59,7 +61,8 @@ public class TestsForm extends DataSetControlForm<Test> {
     }
     @Override
     public boolean isObjectVisible(Test object) {
-        return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Group, object.group_id);
+        return super.isObjectVisible(object) &&
+                Global.testingServer.db.getTable(Group.class).getUI().matchCurrentID(object.group_id);
     }
     @Override
     protected DBObjectDialog getDialog() {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
index e478cb7f..ee0bfe94 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
@@ -17,8 +17,8 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.DVMConfiguration;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
index d7cfb32b..8eb948d0 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
@@ -23,8 +23,8 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.DVMPackage;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
index 631ce4e9..140a61ce 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
@@ -1,8 +1,10 @@
 package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
+import Common.MainModule_;
 import Common.Passes.Pass;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
@@ -31,7 +33,7 @@ public class DVMSettingsFields implements DialogFields {
             @Override
             public void actionPerformed(ActionEvent e) {
                 Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
-                if (pass.Do(Global.mainModule.getCompiler())) {
+                if (pass.Do(MainModule_.instance.getDb().getTable(Compiler.class).getUI().getCurrent())) {
                     tfFlags.setText((String) pass.target);
                 }
             }
@@ -40,7 +42,7 @@ public class DVMSettingsFields implements DialogFields {
             @Override
             public void actionPerformed(ActionEvent e) {
                 Pass pass = Global.mainModule.getPass(PassCode.PickCompilerEnvironmentsForTesting);
-                if (pass.Do(Global.mainModule.getCompiler()))
+                if (pass.Do(MainModule_.instance.getDb().getTable(Compiler.class).getUI().getCurrent()))
                     tfEnvironments.setText((String) pass.target);
             }
         });
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
index b86e32fc..2dff838c 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
@@ -13,9 +13,10 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
     public DVMSettingsForm(DataSet<?, DVMSettings> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
     }
+
     @Override
-    protected Current CurrentName() {
-        return Current.DVMSettings;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
index 2d0897a0..42eae775 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
@@ -19,8 +19,8 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.DVMRunTask;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
index 98f34ad9..1ac429c8 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
@@ -18,8 +18,8 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.SapforConfiguration;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
index 1fa72f95..95ba7dfc 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
@@ -23,8 +23,8 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.SapforPackage;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
index 035d83dc..a70353dc 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
@@ -13,8 +13,8 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.SapforSettings;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandDialog.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandDialog.java
index 1cf294a6..9ec1e944 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandDialog.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandDialog.java
@@ -3,6 +3,7 @@ import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
 public class SapforSettingsCommandDialog extends DBObjectDialog<SapforSettingsCommand, SapforSettingsCommandFields> {
     public SapforSettingsCommandDialog() {
@@ -19,6 +20,6 @@ public class SapforSettingsCommandDialog extends DBObjectDialog<SapforSettingsCo
     @Override
     public void ProcessResult() {
         Result.passCode = (PassCode) fields.cbPassCode.getSelectedItem();
-        Result.sapforsettings_id = Global.mainModule.getSapforSettings().id;
+        Result.sapforsettings_id = Global.testingServer.db.getTable(SapforSettings.class).getUI().getCurrent().id;
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
index 7e0da7e2..4901e31e 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
@@ -5,7 +5,9 @@ import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
+import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
 
 import javax.swing.*;
@@ -14,8 +16,8 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.SapforSettingsCommand;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
@@ -45,7 +47,8 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
     }
     @Override
     public boolean isObjectVisible(SapforSettingsCommand object) {
-        return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.SapforSettings, object.sapforsettings_id);
+        return super.isObjectVisible(object) &&
+                Global.testingServer.db.getTable(SapforSettings.class).getUI().matchCurrentID(object.sapforsettings_id);
     }
     @Override
     protected DBObjectDialog getDialog() {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
index 4848dab8..0106d2f1 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
@@ -16,8 +16,8 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
         super(dataSource_in, mountPanel_in);
     }
     @Override
-    protected Current CurrentName() {
-        return Current.ServerSapfor;
+    protected boolean needsCurrent() {
+        return true;
     }
     @Override
     protected boolean hasCheckBox() {
diff --git a/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsMenuBar.java b/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsMenuBar.java
index 6380589c..9d868c69 100644
--- a/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsMenuBar.java
@@ -1,8 +1,11 @@
 package _VisualDVM.Visual.Menus.CredentialsBar;
+import Common.MainModule_;
 import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Menus.VisualiserMenuBar;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
+import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.Passes.PassCode;
 
 import java.awt.event.ActionEvent;
@@ -41,10 +44,12 @@ public class CredentialsMenuBar extends VisualiserMenuBar {
         });
     }
     public void ShowMachine() {
-        MachineButton.setText(Global.mainModule.getMachine().getURL());
+        MachineButton.setText(
+                MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().getURL());
     }
     public void ShowUser() {
-        UserButton.setText(Global.mainModule.getUser().login);
+        UserButton.setText(
+                MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent().login);
     }
     public void ShowNoMachine() {
         MachineButton.setText("?");
diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.java b/src/_VisualDVM/Visual/Windows/CallbackForm.java
index 51e53ecf..37a14a36 100644
--- a/src/_VisualDVM/Visual/Windows/CallbackForm.java
+++ b/src/_VisualDVM/Visual/Windows/CallbackForm.java
@@ -43,8 +43,8 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         }
         @Override
         public void changedUpdate(DocumentEvent e) {
-            if (!Global.mainModule.getBugReport().state.equals(BugReportState.draft))
-                Global.mainModule.getBugReport().descriptionAdditionDraft =
+            if (!Global.componentsServer.db.bugReports.getUI().getCurrent().state.equals(BugReportState.draft))
+                Global.componentsServer.db.bugReports.getUI().getCurrent().descriptionAdditionDraft =
                         BugReportDescriptionAddition.getText();
         }
     };
@@ -57,8 +57,8 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         }
         @Override
         public void changedUpdate(DocumentEvent e) {
-            if (!Global.mainModule.getBugReport().state.equals(BugReportState.draft))
-                Global.mainModule.getBugReport().commentAdditionDraft = BugReportCommentAddition.getText();
+            if (!Global.componentsServer.db.bugReports.getUI().getCurrent().state.equals(BugReportState.draft))
+                Global.componentsServer.db.bugReports.getUI().getCurrent().commentAdditionDraft = BugReportCommentAddition.getText();
         }
     };
     DocumentListener descriptionListener = new DocumentListener() {
@@ -70,10 +70,10 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         }
         @Override
         public void changedUpdate(DocumentEvent e) {
-            if (Global.mainModule.getBugReport().state.equals(BugReportState.draft))
-                Global.mainModule.getBugReport().description =
+            if (Global.componentsServer.db.bugReports.getUI().getCurrent().state.equals(BugReportState.draft))
+                Global.componentsServer.db.bugReports.getUI().getCurrent().description =
                         BugReportDescription.getText();
-            Global.componentsServer.db.bugReports.getUI().Refresh();
+            Global.componentsServer.db.bugReports.getUI().RedrawControl();
         }
     };
     DocumentListener commentListener = new DocumentListener() {
@@ -85,8 +85,8 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         }
         @Override
         public void changedUpdate(DocumentEvent e) {
-            if (Global.mainModule.getBugReport().state.equals(BugReportState.draft))
-                Global.mainModule.getBugReport().comment = BugReportComment.getText();
+            if (Global.componentsServer.db.bugReports.getUI().getCurrent().state.equals(BugReportState.draft))
+                Global.componentsServer.db.bugReports.getUI().getCurrent().comment = BugReportComment.getText();
         }
     };
     //-------------------------------------------
@@ -507,7 +507,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
     public void ShowCurrentBugReport() {
         SwitchListeners(false);
         // currentBugReportTabs.setSelectedIndex(0);
-        BugReport target = Global.mainModule.getBugReport();
+        BugReport target = Global.componentsServer.db.bugReports.getUI().getCurrent();
         target.CheckSubscribers();
         Global.componentsServer.db.subscribers.ShowUI();
         //-
diff --git a/src/_VisualDVM/Visual/Windows/ComparisonForm.java b/src/_VisualDVM/Visual/Windows/ComparisonForm.java
index e06c9e59..e586f0e8 100644
--- a/src/_VisualDVM/Visual/Windows/ComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/ComparisonForm.java
@@ -2,13 +2,10 @@ package _VisualDVM.Visual.Windows;
 import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 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.ProjectData.Files.UI.Editor.SPFEditor;
 import _VisualDVM.Utils;
 import _VisualDVM.Visual.Editor.BaseEditor;
@@ -135,24 +132,14 @@ public abstract class ComparisonForm<T> {
         removeObject();
         showNoObject();
         ClearText();
-        /*
-        if (isMaster())
-            slave.ClearText();
-        else if (isSlave())
-            master.ClearText();
-         */
     }
+    public abstract Object getDefaultCurrentObject();
     public void ApplyObject() {
-        RemoveObject();
-        TextLog log = new TextLog();
-        if (Global.mainModule.Check(log, getCurrentObjectName())) {
-            object = (T) Global.mainModule.get(getCurrentObjectName());
-            applyObject();
-            showObject();
-        } else
-            UI.Info(log.toString());
+        if (getDefaultCurrentObject()!=null)
+            ApplyObject(getDefaultCurrentObject());
+        else UI.Info("Текущий объект для сравнения не назначен!");
     }
-    public void ApplyObject(DBObject object_in) {
+    public void ApplyObject(Object object_in) {
         RemoveObject();
         object = (T) object_in;
         applyObject();
@@ -272,7 +259,6 @@ public abstract class ComparisonForm<T> {
     }
     //Перегружаемые методы.
     //--->>
-    protected abstract Current getCurrentObjectName();
     protected void showNoObject() {
         lObjectName.setText("?");
         lObjectName.setToolTipText("Объект не назначен.");
diff --git a/src/_VisualDVM/Visual/Windows/CompilationTasksComparisonForm.java b/src/_VisualDVM/Visual/Windows/CompilationTasksComparisonForm.java
index 9597eea3..4e4297ed 100644
--- a/src/_VisualDVM/Visual/Windows/CompilationTasksComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/CompilationTasksComparisonForm.java
@@ -1,13 +1,13 @@
 package _VisualDVM.Visual.Windows;
-import _VisualDVM.Current;
+import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
 public class CompilationTasksComparisonForm extends TasksComparisonForm<CompilationTask> {
     public CompilationTasksComparisonForm(ComparisonForm<CompilationTask> slave_in) {
         super(CompilationTask.class, slave_in);
     }
     @Override
-    protected Current getCurrentObjectName() {
-        return Current.CompilationTask;
+    public Object getDefaultCurrentObject() {
+        return Global.mainModule.getDb().compilationTasks.getUI().getCurrent();
     }
     @Override
     protected String getTextByTab() {
diff --git a/src/_VisualDVM/Visual/Windows/DVMRunTasksComparisonForm.java b/src/_VisualDVM/Visual/Windows/DVMRunTasksComparisonForm.java
index 102c4fc4..efcb0191 100644
--- a/src/_VisualDVM/Visual/Windows/DVMRunTasksComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/DVMRunTasksComparisonForm.java
@@ -1,13 +1,13 @@
 package _VisualDVM.Visual.Windows;
-import _VisualDVM.Current;
+import _VisualDVM.Global;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
 public class DVMRunTasksComparisonForm extends TasksComparisonForm<DVMRunTask> {
     public DVMRunTasksComparisonForm(ComparisonForm<DVMRunTask> slave_in) {
         super(DVMRunTask.class, slave_in);
     }
     @Override
-    protected Current getCurrentObjectName() {
-        return Current.DVMRunTask;
+    public Object getDefaultCurrentObject() {
+        return Global.testingServer.db.dvmRunTasks.getUI().getCurrent();
     }
     @Override
     protected String getTextByTab() {
diff --git a/src/_VisualDVM/Visual/Windows/ProjectForm.java b/src/_VisualDVM/Visual/Windows/ProjectForm.java
index 50f2078d..b1c20afb 100644
--- a/src/_VisualDVM/Visual/Windows/ProjectForm.java
+++ b/src/_VisualDVM/Visual/Windows/ProjectForm.java
@@ -112,7 +112,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
     }
     @Override
     public void RefreshProjectFiles() {
-        filesForm.Refresh();
+        filesForm.RedrawControl();
     }
     @Override
     public void ShowSelectedDirectory() {
diff --git a/src/_VisualDVM/Visual/Windows/RunTasksComparisonForm.java b/src/_VisualDVM/Visual/Windows/RunTasksComparisonForm.java
index e03d8f2a..9d358abd 100644
--- a/src/_VisualDVM/Visual/Windows/RunTasksComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/RunTasksComparisonForm.java
@@ -1,13 +1,13 @@
 package _VisualDVM.Visual.Windows;
-import _VisualDVM.Current;
+import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 public class RunTasksComparisonForm extends TasksComparisonForm<RunTask> {
     public RunTasksComparisonForm(ComparisonForm<RunTask> slave_in) {
         super(RunTask.class, slave_in);
     }
     @Override
-    protected Current getCurrentObjectName() {
-        return Current.RunTask;
+    public Object getDefaultCurrentObject() {
+        return Global.mainModule.getDb().runTasks.getUI().getCurrent();
     }
     @Override
     protected TasksComparisonState getFirstState() {
diff --git a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
index 5b017961..df627a95 100644
--- a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
@@ -96,8 +96,8 @@ public class SapforPackagesComparisonForm {
         RemoveObject();
         //---
         TextLog log = new TextLog();
-        if (Global.mainModule.Check(log, Current.SapforPackage)) {
-            object = Global.mainModule.getSapforPackage();
+        if (Global.testingServer.db.sapforPackages.getUI().Check(log)) {
+            object = Global.testingServer.db.sapforPackages.getUI().getCurrent();
             if (object.isLoaded() || (Global.mainModule.getPass(PassCode.DownloadSapforPackage).Do(object))) {
                 showObject();
             }
diff --git a/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java b/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java
index b058f911..775dd114 100644
--- a/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Windows;
+import Common.Database.Objects.DBObject;
 import Common.Utils.Utils_;
 import Common.Visual.Controls.MenuBarButton;
 import _VisualDVM.Constants;
@@ -96,10 +97,6 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
         }
     }
     @Override
-    protected Current getCurrentObjectName() {
-        return current;
-    }
-    @Override
     protected String getText() {
         return isReady() ?
                 (file.file.exists() ? Utils.ReadAllText(file.file) : "файл не найден")
@@ -110,6 +107,10 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
         return super.isReady() && file != null;
     }
     @Override
+    public Object getDefaultCurrentObject() {
+        return Global.mainModule.get(current);
+    }
+    @Override
     protected void showObject() {
         lObjectName.setText(object.toString());
         lObjectName.setToolTipText(object.Home.getName() + " : " + Utils_.Brackets(object.description));
diff --git a/src/_VisualDVM/Visual/Windows/TestingForm.java b/src/_VisualDVM/Visual/Windows/TestingForm.java
index 8989ee8c..bce40dc9 100644
--- a/src/_VisualDVM/Visual/Windows/TestingForm.java
+++ b/src/_VisualDVM/Visual/Windows/TestingForm.java
@@ -1,10 +1,12 @@
 package _VisualDVM.Visual.Windows;
 import Common.CommonConstants;
+import Common.MainModule_;
 import Common.Visual.FormWithSplitters;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.UI;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.Compiler.CompilerType;
 import _VisualDVM.GlobalData.Credentials.Credentials;
 import _VisualDVM.TestingSystem.Common.TestingServer;
@@ -221,13 +223,14 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     }
     @Override
     public void ShowCurrentCompiler() {
-        String title = (Global.mainModule.HasCompiler() && Global.mainModule.getCompiler().type.equals(CompilerType.dvm)) ?
-                "DVM система: " + Global.mainModule.getCompiler().description : "DVM система: ?";
+        Compiler compiler = (MainModule_.instance.getDb().getTable(Compiler.class).getUI().getCurrent());
+        String title = (compiler!=null)&& (compiler.type.equals(CompilerType.dvm)) ?
+                "DVM система: " + compiler.description : "DVM система: ?";
         testingTabs.setTitleAt(0, title);
     }
     @Override
     public void ShowCurrentServerSapfor() {
-        testingTabs.setTitleAt(2, "SAPFOR: " + Global.mainModule.getServerSapfor().version);
+        testingTabs.setTitleAt(2, "SAPFOR: " +  Global.testingServer.db.serverSapfors.getUI().getCurrent().version);
     }
     @Override
     public void ShowNoServerSapfor() {
@@ -267,7 +270,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         testingTabs.setSelectedIndex(3);
     }
     public void RestoreLastCredentials() {
-        Credentials credentials = Global.mainModule.getCredentials();
+        /*
+        Credentials credentials = MainModule_.instance.getDb().getTable(Credentials.class).get;
         if (credentials.machine_id != CommonConstants.Nan) {
             if (Global.mainModule.getDb().machines.containsKey(credentials.machine_id)) {
                 (Global.mainModule.getDb()).machines.ShowUI(credentials.machine_id);
@@ -307,6 +311,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
                 (Global.mainModule.getDb()).UpdateCredentials();
             }
         }
+         */
     }
     @Override
     public void CollapseCredentials() {
diff --git a/src/_VisualDVM/Visual/Windows/VariantsForm.java b/src/_VisualDVM/Visual/Windows/VariantsForm.java
index ca586726..5f9e2055 100644
--- a/src/_VisualDVM/Visual/Windows/VariantsForm.java
+++ b/src/_VisualDVM/Visual/Windows/VariantsForm.java
@@ -90,7 +90,7 @@ public class VariantsForm implements VariantsWindow {
     }
     @Override
     public void RefreshVariants() {
-        Global.mainModule.getProject().parallelVariants.getUI().Refresh();
+        Global.mainModule.getProject().parallelVariants.getUI().RedrawControl();
     }
     @Override
     public void ShowNoVariants() {
diff --git a/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java b/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java
index b8d1e697..6ec4981b 100644
--- a/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java
@@ -1,6 +1,5 @@
 package _VisualDVM.Visual.Windows;
 import Common.Utils.Utils_;
-import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -51,8 +50,8 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
         return (VersionsComparisonForm) slave;
     }
     @Override
-    protected Current getCurrentObjectName() {
-        return Current.Version;
+    public Object getDefaultCurrentObject() {
+        return Global.mainModule.getVersion();
     }
     @Override
     protected String getText() {