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

---
 .idea/workspace.xml                           |  78 +++++++++++-
 src/Common/Visual/DataSetControlForm.java     |   4 +-
 .../GlobalData/Compiler/CompilersDBTable.java |  38 +-----
 .../GlobalData/Compiler/UI/CompilersForm.java |  48 ++++++++
 .../CompilerEnvironmentsSet.java              |  21 +---
 .../UI/CompilerEnvironmentsForm.java          |  28 +++++
 .../CompilerOption/CompilerOptionsForm.java   |  32 +++++
 .../CompilerOption/CompilerOptionsSet.java    |  22 +---
 .../DVMParameter/DVMParameterDBTable.java     |  22 +---
 .../DVMParameter/UI/DVMParametersForm.java    |  31 +++++
 .../EnvironmentValuesDBTable.java             |  22 +---
 .../UI/EnvironmentsValuesForm.java            |  31 +++++
 .../FileObject/DirInfosDataSet.java           |  13 +-
 .../FileObject/{ => UI}/DirInfosFields.form   |   2 +-
 .../FileObject/{ => UI}/DirInfosFields.java   |   2 +-
 .../FileObject/UI/DirInfosForm.java           |  21 ++++
 .../GlobalData/Machine/MachinesDBTable.java   |  55 +--------
 .../GlobalData/Machine/UI/MachinesForm.java   |  63 ++++++++++
 .../GlobalData/Makefile/MakefilesDBTable.java |  33 +-----
 .../GlobalData/Makefile/UI/MakefilesForm.java |  42 +++++++
 .../GlobalData/Module/ModulesDBTable.java     |  25 +---
 .../GlobalData/Module/UI/ModulesForm.java     |  34 ++++++
 .../RunConfigurationsDBTable.java             |  33 +-----
 .../UI/RunConfigurationsForm.java             |  42 +++++++
 .../SapforProfileSettingsDBTable.java         |  19 +--
 .../UI/SapforProfileSettingsForm.java         |  26 ++++
 .../CompilationTasksDBTable.java              |  48 +-------
 .../UI/CompilationTasksForm.java              |  56 +++++++++
 .../Tasks/RunTask/RunTasksDBTable.java        |  37 +-----
 .../Tasks/RunTask/UI/RunTasksForm.java        |  49 ++++++++
 .../GlobalData/User/UI/UsersForm.java         |  48 ++++++++
 .../GlobalData/User/UsersDBTable.java         |  39 +-----
 src/_VisualDVM/Passes/All/AddBugReport.java   |   2 +-
 .../Passes/All/AppendBugReportField.java      |   2 +-
 .../All/DeleteDownloadedBugReports.java       |   2 +-
 .../Passes/All/DownloadBugReport.java         |   2 +-
 .../Passes/All/OpenBugReportTestProject.java  |   2 +-
 .../Passes/All/PublishBugReport.java          |   2 +-
 .../Passes/All/SaveBugReportRecipients.java   |   2 +-
 src/_VisualDVM/Passes/All/SendBugReport.java  |   2 +-
 .../Passes/All/UpdateBugReportField.java      |   2 +-
 .../ProjectData/DBArray/ArraysDBTable.java    |  25 +---
 .../ProjectData/DBArray/UI/DBArraysForm.java  |  33 ++++++
 .../Messages/MessagesControlForm.java         |   2 +-
 .../RecommendationsDBTable.java               |  18 +--
 .../UI/RecommendationsForm.java               |  26 ++++
 .../ProjectData/Project/db_project_info.java  |  12 +-
 .../SapforData/Arrays/ArraysSet.java          |  65 ----------
 .../SapforData/Arrays/ProjectArraysSet.java   |  35 ++++++
 .../Arrays/UI/ProjectArraysForm.java          |  42 +++++++
 .../Regions/ParallelRegionsSet.java           |  32 +++++
 .../SapforData/Regions/RegionsSet.java        |  50 --------
 .../Regions/UI/ParallelRegionsForm.java       |  31 +++++
 .../Variants/ParallelVariantsSet.java         |  24 ++++
 .../Variants/UI/ParallelVariantsForm.java     |  53 +++++++++
 .../SapforData/Variants/VariantsSet.java      |  67 -----------
 .../Repository/BugReport/BugReport.java       |   1 +
 .../BugReport/BugReportsDBTable.java          |  72 +----------
 .../{ => UI}/BugReportInterface.java          |   5 +-
 .../BugReport/UI/BugReportsForm.java          |  80 +++++++++++++
 .../Repository/Component/ComponentsSet.java   |  45 +------
 .../Component/UI/ComponentsForm.java          |  77 +++++++-----
 .../Component/UI/ComponentsWindow.java        |  43 +++++++
 .../Repository/Server/ComponentsServer.java   |   2 +-
 .../Subscribes/SubsribersDBTable.java         |  32 +----
 .../Subscribes/UI/SubsribersForm.java         |  43 +++++++
 .../DVMConfigurationDBTable.java              |  37 +-----
 .../UI/DVMConfigurationsForm.java             |  46 +++++++
 .../DVM/DVMPackage/DVMPackageDBTable.java     |  95 +--------------
 .../DVM/DVMPackage/UI/DVMPackagesForm.java    | 112 ++++++++++++++++++
 .../DVM/DVMTasks/DVMRunTasksSet.java          |  69 +----------
 .../DVM/DVMTasks/UI/DVMRunTasksForm.java      |  82 +++++++++++++
 .../SapforConfigurationDBTable.java           |  41 +------
 .../UI/SapforConfigurationsForm.java          |  52 ++++++++
 .../SapforPackage/SapforPackageDBTable.java   |  78 +-----------
 .../SapforPackage/UI/SapforPackagesForm.java  |  95 +++++++++++++++
 .../ServerSapfor/ServerSapforsDBTable.java    |  41 +------
 .../ServerSapfor/UI/ServerSapforsForm.java    |  52 ++++++++
 src/_VisualDVM/Visual/MainUI.java             |   8 +-
 .../Visual/Windows/CallbackForm.java          |   2 +-
 src/_VisualDVM/Visual/Windows/FileForm.java   |   3 +-
 81 files changed, 1637 insertions(+), 1173 deletions(-)
 create mode 100644 src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
 create mode 100644 src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsForm.java
 create mode 100644 src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsForm.java
 create mode 100644 src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java
 create mode 100644 src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
 rename src/_VisualDVM/GlobalData/FileObject/{ => UI}/DirInfosFields.form (83%)
 rename src/_VisualDVM/GlobalData/FileObject/{ => UI}/DirInfosFields.java (85%)
 create mode 100644 src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java
 create mode 100644 src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
 create mode 100644 src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
 create mode 100644 src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
 create mode 100644 src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
 create mode 100644 src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java
 create mode 100644 src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
 create mode 100644 src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
 create mode 100644 src/_VisualDVM/GlobalData/User/UI/UsersForm.java
 create mode 100644 src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
 create mode 100644 src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java
 delete mode 100644 src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
 create mode 100644 src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java
 create mode 100644 src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
 create mode 100644 src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java
 delete mode 100644 src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
 create mode 100644 src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java
 create mode 100644 src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java
 create mode 100644 src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
 delete mode 100644 src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java
 rename src/_VisualDVM/Repository/BugReport/{ => UI}/BugReportInterface.java (96%)
 create mode 100644 src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
 create mode 100644 src/_VisualDVM/Repository/Component/UI/ComponentsWindow.java
 create mode 100644 src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
 create mode 100644 src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
 create mode 100644 src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
 create mode 100644 src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
 create mode 100644 src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
 create mode 100644 src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
 create mode 100644 src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8725eddf..cd8226a2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,83 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsWindow.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfosFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfosFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/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/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteDownloadedBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteDownloadedBugReports.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.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/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportRecipients.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/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.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/ArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.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/Repository/BugReport/BugReportInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/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/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -116,11 +190,11 @@
       <recent name="Common.Visual.UI_" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\GlobalData\FileObject\UI" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\icons" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\Visual\Windows" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Visual\Windows" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Visual\Main" />
-      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Visual\Syntax" />
     </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="_VisualDVM.Visual.Windows" />
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index 28802eaa..ef18b767 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -25,7 +25,7 @@ import java.util.LinkedHashMap;
 import java.util.Vector;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-public class DataSetControlForm extends ControlForm<DataTable> {
+public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTable> {
     protected DataSet dataSource; //источник данных
     protected DataMenuBar bar = null; //верхняя панель меню
     protected int current_row_i; //индекс текущей строки.
@@ -43,7 +43,7 @@ public class DataSetControlForm extends ControlForm<DataTable> {
     Object savedCurrentKey = null;
     Vector<Object> savedSelectedKeys = new Vector<>();
     //--
-    public DataSetControlForm(DataSet dataSource_in, JPanel mountPanel_in) {
+    public DataSetControlForm(DataSet<?,D> dataSource_in, JPanel mountPanel_in) {
         super(DataTable.class, mountPanel_in);
         dataSource = dataSource_in;
         createFilters();
diff --git a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
index 47da2a56..5a2c7171 100644
--- a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
+++ b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
@@ -13,6 +13,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.UI.CompilerFields;
+import _VisualDVM.GlobalData.Compiler.UI.CompilersForm;
 import _VisualDVM.GlobalData.Makefile.Makefile;
 import _VisualDVM.GlobalData.Module.Module;
 import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
@@ -121,42 +122,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "описание",
-                        "команда вызова",
-                        "версия",
-                        "ревизия"};
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-            }
-            @Override
-            public void ShowCurrentObject() throws Exception {
-                super.ShowCurrentObject();
-                Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
-            }
-            @Override
-            public void ShowNoCurrentObject() throws Exception {
-                super.ShowNoCurrentObject();
-                Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
-            }
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(), PassCode.AddCompiler,
-                        PassCode.EditCompiler,
-                        PassCode.DeleteCompiler,
-                        PassCode.ShowCompilerVersion,
-                        PassCode.ShowCompilerHelp);
-            }
-        };
+        return new CompilersForm(this, mountPanel);
     }
     @Override
     public Current CurrentName() {
diff --git a/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java b/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
new file mode 100644
index 00000000..545c2e11
--- /dev/null
+++ b/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
@@ -0,0 +1,48 @@
+package _VisualDVM.GlobalData.Compiler.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Compiler.Compiler;
+import _VisualDVM.Passes.PassCode;
+
+import javax.swing.*;
+public class CompilersForm extends DataSetControlForm<Compiler> {
+    public CompilersForm(DataSet<?, Compiler> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "описание",
+                "команда вызова",
+                "версия",
+                "ревизия"};
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(0).setVisible(false);
+    }
+    @Override
+    public void ShowCurrentObject() throws Exception {
+        super.ShowCurrentObject();
+        Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
+    }
+    @Override
+    public void ShowNoCurrentObject() throws Exception {
+        super.ShowNoCurrentObject();
+        Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.AddCompiler,
+                PassCode.EditCompiler,
+                PassCode.DeleteCompiler,
+                PassCode.ShowCompilerVersion,
+                PassCode.ShowCompilerHelp);
+    }
+}
diff --git a/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java b/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java
index 750f8c56..50539c63 100644
--- a/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java
+++ b/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java
@@ -4,6 +4,7 @@ import Common.Visual.DataSetControlForm;
 import Common.Visual.Tables.RendererMultiline;
 import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
 import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer;
+import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsForm;
 
 import javax.swing.*;
 public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment> {
@@ -12,24 +13,6 @@ public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Значение", "Описание"
-                };
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(2).setRendererClass(CompilerEnvironmentValueRenderer.class);
-                columns.get(2).setEditorClass(CompilerEnvironmentValueEditor.class);
-                //-
-                columns.get(3).setRendererClass(RendererMultiline.class);
-            }
-        };
+        return new CompilerEnvironmentsForm(this, mountPanel);
     }
 }
diff --git a/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsForm.java b/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsForm.java
new file mode 100644
index 00000000..b8594867
--- /dev/null
+++ b/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsForm.java
@@ -0,0 +1,28 @@
+package _VisualDVM.GlobalData.CompilerEnvironment.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Tables.RendererMultiline;
+import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
+
+import javax.swing.*;
+public class CompilerEnvironmentsForm extends DataSetControlForm<CompilerEnvironment> {
+    public CompilerEnvironmentsForm(DataSet<?, CompilerEnvironment> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Значение", "Описание"
+        };
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(2).setRendererClass(CompilerEnvironmentValueRenderer.class);
+        columns.get(2).setEditorClass(CompilerEnvironmentValueEditor.class);
+        columns.get(3).setRendererClass(RendererMultiline.class);
+    }
+}
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsForm.java b/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsForm.java
new file mode 100644
index 00000000..401e8cfc
--- /dev/null
+++ b/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsForm.java
@@ -0,0 +1,32 @@
+package _VisualDVM.GlobalData.CompilerOption;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Tables.RendererMultiline;
+import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer;
+import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
+
+import javax.swing.*;
+public class CompilerOptionsForm extends DataSetControlForm<CompilerOption> {
+    public CompilerOptionsForm(DataSet<?, CompilerOption> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Параметр",
+                "Значение",
+                "Описание"
+        };
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(2).setRendererClass(CompilerOptionParameterNameRenderer.class);
+        columns.get(3).setRendererClass(CompilerOptionParameterValueRenderer.class);
+        columns.get(3).setEditorClass(CompilerOptionParameterValueRenderer.class);
+        columns.get(4).setRendererClass(RendererMultiline.class);
+    }
+}
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java b/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java
index 7b4681aa..5e441558 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java
@@ -12,26 +12,6 @@ public class CompilerOptionsSet extends DataSet<String, CompilerOption> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Параметр",
-                        "Значение",
-                        "Описание"
-                };
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(2).setRendererClass(CompilerOptionParameterNameRenderer.class);
-                columns.get(3).setRendererClass(CompilerOptionParameterValueRenderer.class);
-                columns.get(3).setEditorClass(CompilerOptionParameterValueRenderer.class);
-                columns.get(4).setRendererClass(RendererMultiline.class);
-            }
-        };
+        return new CompilerOptionsForm(this, mountPanel);
     }
 }
diff --git a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
index 29b33116..fe8d3ea3 100644
--- a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
+++ b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
@@ -9,6 +9,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.DVMParameter.UI.DVMParameterFields;
+import _VisualDVM.GlobalData.DVMParameter.UI.DVMParametersForm;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Utils;
 
@@ -31,26 +32,7 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "имя",
-                        "значение"
-                };
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(),
-                        PassCode.AddDVMParameter,
-                        PassCode.EditDVMParameter,
-                        PassCode.DeleteDVMParameter);
-            }
-        };
+        return new DVMParametersForm(this, mountPanel);
     }
     @Override
     public DBObjectDialog<DVMParameter, DVMParameterFields> getDialog() {
diff --git a/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java b/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java
new file mode 100644
index 00000000..f98947a1
--- /dev/null
+++ b/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java
@@ -0,0 +1,31 @@
+package _VisualDVM.GlobalData.DVMParameter.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
+import _VisualDVM.Passes.PassCode;
+
+import javax.swing.*;
+public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
+    public DVMParametersForm(DataSet<?, DVMParameter> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "имя",
+                "значение"
+        };
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(0).setVisible(false);
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(),
+                PassCode.AddDVMParameter,
+                PassCode.EditDVMParameter,
+                PassCode.DeleteDVMParameter);
+    }
+}
diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
index 5ad37b63..32265cbc 100644
--- a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
+++ b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
@@ -9,6 +9,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
+import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentsValuesForm;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Utils;
 
@@ -70,26 +71,7 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "имя",
-                        "значение"};
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(),
-                        PassCode.AddEnvironmentValue,
-                        PassCode.EditEnvironmentValue,
-                        PassCode.DeleteEnvironmentValue,
-                        PassCode.PickCompilerEnvironments);
-            }
-        };
+        return new EnvironmentsValuesForm(this, mountPanel);
     }
     @Override
     public Current CurrentName() {
diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java b/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
new file mode 100644
index 00000000..7308fddf
--- /dev/null
+++ b/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
@@ -0,0 +1,31 @@
+package _VisualDVM.GlobalData.EnvironmentValue.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
+import _VisualDVM.Passes.PassCode;
+
+import javax.swing.*;
+public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue> {
+    public EnvironmentsValuesForm(DataSet<?, EnvironmentValue> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "имя",
+                "значение"};
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(0).setVisible(false);
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(),
+                PassCode.AddEnvironmentValue,
+                PassCode.EditEnvironmentValue,
+                PassCode.DeleteEnvironmentValue,
+                PassCode.PickCompilerEnvironments);
+    }
+}
diff --git a/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java b/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java
index 2bf9b28b..03c2a7b5 100644
--- a/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java
+++ b/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java
@@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.FileObject;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Tables.RendererDate;
+import _VisualDVM.GlobalData.FileObject.UI.DirInfosForm;
 
 import javax.swing.*;
 public class DirInfosDataSet extends DataSet<String, DirInfo> {
@@ -10,16 +11,6 @@ public class DirInfosDataSet extends DataSet<String, DirInfo> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "дата изменения"};
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(1).setRendererClass(RendererDate.class);
-            }
-        };
+        return new DirInfosForm(this, mountPanel);
     }
 }
diff --git a/src/_VisualDVM/GlobalData/FileObject/DirInfosFields.form b/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosFields.form
similarity index 83%
rename from src/_VisualDVM/GlobalData/FileObject/DirInfosFields.form
rename to src/_VisualDVM/GlobalData/FileObject/UI/DirInfosFields.form
index d233bfca..f4a809c5 100644
--- a/src/_VisualDVM/GlobalData/FileObject/DirInfosFields.form
+++ b/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosFields.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.GlobalData.FileObject.DirInfosFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.GlobalData.FileObject.UI.DirInfosFields">
   <grid id="27dc6" binding="content" layout-manager="BorderLayout" hgap="0" vgap="0">
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>
diff --git a/src/_VisualDVM/GlobalData/FileObject/DirInfosFields.java b/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosFields.java
similarity index 85%
rename from src/_VisualDVM/GlobalData/FileObject/DirInfosFields.java
rename to src/_VisualDVM/GlobalData/FileObject/UI/DirInfosFields.java
index 8007e67b..504cfccf 100644
--- a/src/_VisualDVM/GlobalData/FileObject/DirInfosFields.java
+++ b/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosFields.java
@@ -1,4 +1,4 @@
-package _VisualDVM.GlobalData.FileObject;
+package _VisualDVM.GlobalData.FileObject.UI;
 import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
diff --git a/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java b/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java
new file mode 100644
index 00000000..55a2e03c
--- /dev/null
+++ b/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java
@@ -0,0 +1,21 @@
+package _VisualDVM.GlobalData.FileObject.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Tables.RendererDate;
+import _VisualDVM.GlobalData.FileObject.DirInfo;
+
+import javax.swing.*;
+public class DirInfosForm extends DataSetControlForm<DirInfo> {
+    public DirInfosForm(DataSet<?, DirInfo> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "дата изменения"};
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(1).setRendererClass(RendererDate.class);
+    }
+}
diff --git a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
index 9f8b9bc5..942703df 100644
--- a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
@@ -5,17 +5,15 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
 import Common.Database.Tables.FKDataBehaviour;
 import Common.Database.Tables.iDBTable;
 import Common.Passes.PassCode_;
-import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.DataSetControlForm;
-import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
-import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
 import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
 import _VisualDVM.GlobalData.Machine.UI.MachineFields;
+import _VisualDVM.GlobalData.Machine.UI.MachinesForm;
 import _VisualDVM.GlobalData.Makefile.Makefile;
 import _VisualDVM.GlobalData.Module.Module;
 import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
@@ -25,8 +23,6 @@ import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.LinkedHashMap;
 public class MachinesDBTable extends iDBTable<Machine> {
     public MachinesDBTable() {
@@ -90,54 +86,7 @@ public class MachinesDBTable extends iDBTable<Machine> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{"URL"};
-            }
-            @Override
-            public void ShowCurrentObject() throws Exception {
-                super.ShowCurrentObject();
-                Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
-                Global.mainModule.getUI().getCredentialsMenuBar().ShowMachine();
-            }
-            @Override
-            public void ShowNoCurrentObject() throws Exception {
-                super.ShowNoCurrentObject();
-                Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
-                Global.mainModule.getUI().getCredentialsMenuBar().ShowNoMachine();
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(),
-                        PassCode.AddMachine,
-                        PassCode.EditMachine,
-                        PassCode.DeleteMachine) {
-                    {
-                        add(new MenuBarButton() {
-                            {
-                                setIcon("/Common/icons/SilverArrowUp.png");
-                                setToolTipText("Свернуть");
-                                addActionListener(new ActionListener() {
-                                    @Override
-                                    public void actionPerformed(ActionEvent e) {
-                                        Global.mainModule.getPass(PassCode.UpdateProperty).Do("collapseCredentials", true);
-                                    }
-                                });
-                            }
-                        }, 0);
-                    }
-                };
-            }
-        };
+        return new MachinesForm(this, mountPanel);
     }
     @Override
     public Current CurrentName() {
diff --git a/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java b/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
new file mode 100644
index 00000000..d3a8b8f6
--- /dev/null
+++ b/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
@@ -0,0 +1,63 @@
+package _VisualDVM.GlobalData.Machine.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.Controls.MenuBarButton;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Machine.Machine;
+import _VisualDVM.Passes.PassCode;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+public class MachinesForm extends DataSetControlForm<Machine> {
+    public MachinesForm(DataSet<?, Machine> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{"URL"};
+    }
+    @Override
+    public void ShowCurrentObject() throws Exception {
+        super.ShowCurrentObject();
+        Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
+        Global.mainModule.getUI().getCredentialsMenuBar().ShowMachine();
+    }
+    @Override
+    public void ShowNoCurrentObject() throws Exception {
+        super.ShowNoCurrentObject();
+        Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
+        Global.mainModule.getUI().getCredentialsMenuBar().ShowNoMachine();
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(0).setVisible(false);
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(),
+                PassCode.AddMachine,
+                PassCode.EditMachine,
+                PassCode.DeleteMachine) {
+            {
+                add(new MenuBarButton() {
+                    {
+                        setIcon("/Common/icons/SilverArrowUp.png");
+                        setToolTipText("Свернуть");
+                        addActionListener(new ActionListener() {
+                            @Override
+                            public void actionPerformed(ActionEvent e) {
+                                Global.mainModule.getPass(PassCode.UpdateProperty).Do("collapseCredentials", true);
+                            }
+                        });
+                    }
+                }, 0);
+            }
+        };
+    }
+}
diff --git a/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java b/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
index 2e6b8fe0..a958dd32 100644
--- a/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
@@ -9,6 +9,7 @@ import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
+import _VisualDVM.GlobalData.Makefile.UI.MakefilesForm;
 import _VisualDVM.GlobalData.Module.Module;
 import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorFields;
 import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
@@ -42,37 +43,7 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Линковщик",
-                        "Команда",
-                        "Флаги"
-                };
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(),
-                        PassCode.Compile,
-                        PassCode.AddMakefile,
-                        PassCode.EditMakefile,
-                        PassCode.DeleteMakefile) {
-                    {
-                        addSeparator();
-                        addPasses(PassCode.ShowMakefilePreview, PassCode.EditProjectCompilationMaxtime);
-                    }
-                };
-            }
-        };
+        return new MakefilesForm(this, mountPanel);
     }
     @Override
     public Current CurrentName() {
diff --git a/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java b/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
new file mode 100644
index 00000000..f11249c5
--- /dev/null
+++ b/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
@@ -0,0 +1,42 @@
+package _VisualDVM.GlobalData.Makefile.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import _VisualDVM.GlobalData.Makefile.Makefile;
+import _VisualDVM.Passes.PassCode;
+
+import javax.swing.*;
+public class MakefilesForm extends DataSetControlForm<Makefile> {
+    public MakefilesForm(DataSet<?, Makefile> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Линковщик",
+                "Команда",
+                "Флаги"
+        };
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(0).setVisible(false);
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(),
+                PassCode.Compile,
+                PassCode.AddMakefile,
+                PassCode.EditMakefile,
+                PassCode.DeleteMakefile) {
+            {
+                addSeparator();
+                addPasses(PassCode.ShowMakefilePreview, PassCode.EditProjectCompilationMaxtime);
+            }
+        };
+    }
+}
diff --git a/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java b/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
index f236f600..fdc45634 100644
--- a/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
@@ -6,6 +6,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
+import _VisualDVM.GlobalData.Module.UI.ModulesForm;
 import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
@@ -27,29 +28,7 @@ public class ModulesDBTable extends iDBTable<Module> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Язык",
-                        "Компилятор",
-                        "Команда",
-                        "Флаги"
-                };
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(), PassCode.EditModule);
-            }
-        };
+        return new ModulesForm(this, mountPanel);
     }
     @Override
     public Current CurrentName() {
diff --git a/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java b/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
new file mode 100644
index 00000000..8dc1ee97
--- /dev/null
+++ b/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
@@ -0,0 +1,34 @@
+package _VisualDVM.GlobalData.Module.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import _VisualDVM.GlobalData.Module.Module;
+import _VisualDVM.Passes.PassCode;
+
+import javax.swing.*;
+public class ModulesForm extends DataSetControlForm<Module> {
+    public ModulesForm(DataSet<?, Module> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Язык",
+                "Компилятор",
+                "Команда",
+                "Флаги"
+        };
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(0).setVisible(false);
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.EditModule);
+    }
+}
diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
index bf7ae389..04e2a50b 100644
--- a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
+++ b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
@@ -18,6 +18,7 @@ import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
 import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
 import _VisualDVM.GlobalData.RunConfiguration.UI.MatrixBar;
 import _VisualDVM.GlobalData.RunConfiguration.UI.RunConfigurationFields;
+import _VisualDVM.GlobalData.RunConfiguration.UI.RunConfigurationsForm;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 import _VisualDVM.Passes.PassCode;
 
@@ -119,37 +120,7 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Команда",
-                        "Опции",
-                        "Разм.",
-                        "Куб",
-                        "Min",
-                        "Max",
-                        "Аргументы"
-                };
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(),
-                        PassCode.Run,
-                        PassCode.AddRunConfiguration,
-                        PassCode.EditRunConfiguration,
-                        PassCode.DeleteRunConfiguration) {
-                    {
-                        add(new JSeparator());
-                        addPasses(PassCode.EditProjectRunMaxtime);
-                    }
-                };
-            }
-        };
+        return new RunConfigurationsForm(this, mountPanel);
     }
     @Override
     public Current CurrentName() {
diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java b/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
new file mode 100644
index 00000000..1f6a996d
--- /dev/null
+++ b/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
@@ -0,0 +1,42 @@
+package _VisualDVM.GlobalData.RunConfiguration.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
+import _VisualDVM.Passes.PassCode;
+
+import javax.swing.*;
+public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration> {
+    public RunConfigurationsForm(DataSet<?, RunConfiguration> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Команда",
+                "Опции",
+                "Разм.",
+                "Куб",
+                "Min",
+                "Max",
+                "Аргументы"
+        };
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(0).setVisible(false);
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(),
+                PassCode.Run,
+                PassCode.AddRunConfiguration,
+                PassCode.EditRunConfiguration,
+                PassCode.DeleteRunConfiguration) {
+            {
+                add(new JSeparator());
+                addPasses(PassCode.EditProjectRunMaxtime);
+            }
+        };
+    }
+}
diff --git a/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java b/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java
index 2cffb140..db1da279 100644
--- a/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java
+++ b/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java
@@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.SapforProfileSetting;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
 import _VisualDVM.Current;
+import _VisualDVM.GlobalData.SapforProfileSetting.UI.SapforProfileSettingsForm;
 
 import javax.swing.*;
 public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting> {
@@ -10,23 +11,7 @@ public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting>
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "имя",
-                        "значение"
-                };
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-            }
-            @Override
-            public boolean hasMenuBar() {
-                return false;
-            }
-        };
+        return new SapforProfileSettingsForm(this, mountPanel);
     }
     @Override
     public Current CurrentName() {
diff --git a/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java b/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java
new file mode 100644
index 00000000..03c032fe
--- /dev/null
+++ b/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java
@@ -0,0 +1,26 @@
+package _VisualDVM.GlobalData.SapforProfileSetting.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
+
+import javax.swing.*;
+public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileSetting> {
+    public SapforProfileSettingsForm(DataSet<?, SapforProfileSetting> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "имя",
+                "значение"
+        };
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(0).setVisible(false);
+    }
+    @Override
+    public boolean hasMenuBar() {
+        return false;
+    }
+}
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
index c1b6392d..15b17f83 100644
--- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
@@ -6,11 +6,8 @@ import Common.Database.Tables.FKDataBehaviour;
 import Common.Database.Tables.iDBTable;
 import Common.Passes.PassCode_;
 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.Tasks.CompilationTask.UI.CompilationTasksForm;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 import _VisualDVM.Passes.PassCode;
 
@@ -36,48 +33,7 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "сборка",
-                        "",
-                        "Fortran",
-                        "",
-                        "С",
-                        "",
-                        "С++",
-                        "",
-                        "Лимит(c)",
-                        "Время(c)",
-                        "Дата",
-                        "Статус"
-                };
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(12).setRendererClass(RendererDate.class);
-                columns.get(13).setRendererClass(RendererStatusEnum.class);
-            }
-            @Override
-            public void ShowCurrentObject() throws Exception {
-                super.ShowCurrentObject();
-                Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
-            }
-            @Override
-            public void ShowNoCurrentObject() throws Exception {
-                super.ShowNoCurrentObject();
-                Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(), PassCode.DeleteCompilationTasks);
-            }
-        };
+        return new CompilationTasksForm(this, mountPanel);
     }
     @Override
     public Current CurrentName() {
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
new file mode 100644
index 00000000..8635b296
--- /dev/null
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
@@ -0,0 +1,56 @@
+package _VisualDVM.GlobalData.Tasks.CompilationTask.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.RendererDate;
+import Common.Visual.Tables.RendererStatusEnum;
+import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
+import _VisualDVM.Passes.PassCode;
+
+import javax.swing.*;
+public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
+    public CompilationTasksForm(DataSet<?, CompilationTask> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "сборка",
+                "",
+                "Fortran",
+                "",
+                "С",
+                "",
+                "С++",
+                "",
+                "Лимит(c)",
+                "Время(c)",
+                "Дата",
+                "Статус"
+        };
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(12).setRendererClass(RendererDate.class);
+        columns.get(13).setRendererClass(RendererStatusEnum.class);
+    }
+    @Override
+    public void ShowCurrentObject() throws Exception {
+        super.ShowCurrentObject();
+        Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
+    }
+    @Override
+    public void ShowNoCurrentObject() throws Exception {
+        super.ShowNoCurrentObject();
+        Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteCompilationTasks);
+    }
+}
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
index 6be52603..d2ff740e 100644
--- a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
@@ -7,6 +7,7 @@ import Common.Visual.Tables.RendererDate;
 import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Tasks.RunTask.UI.RunTasksForm;
 import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
@@ -24,41 +25,7 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Матрица",
-                        "Лимит(с)",
-                        "Время(с)",
-                        "Чистое время",
-                        "Дата",
-                        "Статус"};
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(6).setRendererClass(RendererDate.class);
-                columns.get(7).setRendererClass(RendererStatusEnum.class);
-            }
-            @Override
-            public void ShowCurrentObject() throws Exception {
-                super.ShowCurrentObject();
-                Global.mainModule.getUI().getDebugWindow().ShowCurrentRunTask();
-            }
-            @Override
-            public void ShowNoCurrentObject() throws Exception {
-                super.ShowNoCurrentObject();
-                Global.mainModule.getUI().getDebugWindow().ShowNoCurrentRunTask();
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(), PassCode.DeleteRunTasks);
-            }
-        };
+        return new RunTasksForm(this, mountPanel);
     }
     @Override
     public Current CurrentName() {
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
new file mode 100644
index 00000000..38522260
--- /dev/null
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
@@ -0,0 +1,49 @@
+package _VisualDVM.GlobalData.Tasks.RunTask.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.RendererDate;
+import Common.Visual.Tables.RendererStatusEnum;
+import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
+import _VisualDVM.Passes.PassCode;
+
+import javax.swing.*;
+public class RunTasksForm extends DataSetControlForm<RunTask> {
+    public RunTasksForm(DataSet<?, RunTask> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Матрица",
+                "Лимит(с)",
+                "Время(с)",
+                "Чистое время",
+                "Дата",
+                "Статус"};
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(6).setRendererClass(RendererDate.class);
+        columns.get(7).setRendererClass(RendererStatusEnum.class);
+    }
+    @Override
+    public void ShowCurrentObject() throws Exception {
+        super.ShowCurrentObject();
+        Global.mainModule.getUI().getDebugWindow().ShowCurrentRunTask();
+    }
+    @Override
+    public void ShowNoCurrentObject() throws Exception {
+        super.ShowNoCurrentObject();
+        Global.mainModule.getUI().getDebugWindow().ShowNoCurrentRunTask();
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteRunTasks);
+    }
+}
diff --git a/src/_VisualDVM/GlobalData/User/UI/UsersForm.java b/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
new file mode 100644
index 00000000..41d8a132
--- /dev/null
+++ b/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
@@ -0,0 +1,48 @@
+package _VisualDVM.GlobalData.User.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.RendererStatusEnum;
+import _VisualDVM.Global;
+import _VisualDVM.GlobalData.User.User;
+import _VisualDVM.Passes.PassCode;
+
+import javax.swing.*;
+public class UsersForm extends DataSetControlForm<User> {
+    public UsersForm(DataSet<?, User> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Логин",
+                "Статус"};
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(0).setVisible(false);
+        columns.get(3).setRendererClass(RendererStatusEnum.class);
+    }
+    @Override
+    public void ShowCurrentObject() throws Exception {
+        super.ShowCurrentObject();
+        Global.mainModule.getUI().getCredentialsMenuBar().ShowUser();
+    }
+    @Override
+    public void ShowNoCurrentObject() throws Exception {
+        super.ShowNoCurrentObject();
+        Global.mainModule.getUI().getCredentialsMenuBar().ShowNoUser();
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(),
+                PassCode.AddUser,
+                PassCode.EditUser,
+                PassCode.InitialiseUser,
+                PassCode.DeleteUser);
+    }
+}
diff --git a/src/_VisualDVM/GlobalData/User/UsersDBTable.java b/src/_VisualDVM/GlobalData/User/UsersDBTable.java
index 2f45dea3..63a409c4 100644
--- a/src/_VisualDVM/GlobalData/User/UsersDBTable.java
+++ b/src/_VisualDVM/GlobalData/User/UsersDBTable.java
@@ -15,6 +15,7 @@ import _VisualDVM.GlobalData.Machine.MachineType;
 import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 import _VisualDVM.GlobalData.User.UI.UserFields;
+import _VisualDVM.GlobalData.User.UI.UsersForm;
 import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
@@ -75,43 +76,7 @@ public class UsersDBTable extends iDBTable<User> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Логин",
-                        "Статус"};
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-                columns.get(3).setRendererClass(RendererStatusEnum.class);
-            }
-            @Override
-            public void ShowCurrentObject() throws Exception {
-                super.ShowCurrentObject();
-                //  UI.getMainWindow().ShowCurrentCompiler();
-                Global.mainModule.getUI().getCredentialsMenuBar().ShowUser();
-            }
-            @Override
-            public void ShowNoCurrentObject() throws Exception {
-                super.ShowNoCurrentObject();
-                //   UI.getMainWindow().ShowCurrentCompiler();
-                Global.mainModule.getUI().getCredentialsMenuBar().ShowNoUser();
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(),
-                        PassCode.AddUser,
-                        PassCode.EditUser,
-                        PassCode.InitialiseUser,
-                        PassCode.DeleteUser);
-            }
-        };
+        return new UsersForm(this, mountPanel);
     }
     @Override
     public Current CurrentName() {
diff --git a/src/_VisualDVM/Passes/All/AddBugReport.java b/src/_VisualDVM/Passes/All/AddBugReport.java
index 15ec1077..fc5a6749 100644
--- a/src/_VisualDVM/Passes/All/AddBugReport.java
+++ b/src/_VisualDVM/Passes/All/AddBugReport.java
@@ -7,7 +7,7 @@ import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Account.AccountRole;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.BugReportInterface;
+import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
 import _VisualDVM.Repository.BugReport.BugReportState;
 import _VisualDVM.Repository.Component.ComponentType;
 
diff --git a/src/_VisualDVM/Passes/All/AppendBugReportField.java b/src/_VisualDVM/Passes/All/AppendBugReportField.java
index 4dd50824..ced56822 100644
--- a/src/_VisualDVM/Passes/All/AppendBugReportField.java
+++ b/src/_VisualDVM/Passes/All/AppendBugReportField.java
@@ -5,7 +5,7 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
 import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.BugReportInterface;
+import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
diff --git a/src/_VisualDVM/Passes/All/DeleteDownloadedBugReports.java b/src/_VisualDVM/Passes/All/DeleteDownloadedBugReports.java
index 5707bcd1..af6a1ab8 100644
--- a/src/_VisualDVM/Passes/All/DeleteDownloadedBugReports.java
+++ b/src/_VisualDVM/Passes/All/DeleteDownloadedBugReports.java
@@ -5,7 +5,7 @@ import Common.Visual.Windows.Dialog.Dialog;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.FileObject.DirInfo;
 import _VisualDVM.GlobalData.FileObject.DirInfosDataSet;
-import _VisualDVM.GlobalData.FileObject.DirInfosFields;
+import _VisualDVM.GlobalData.FileObject.UI.DirInfosFields;
 import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.Passes.PassCode;
 
diff --git a/src/_VisualDVM/Passes/All/DownloadBugReport.java b/src/_VisualDVM/Passes/All/DownloadBugReport.java
index 2da32da6..efc0d36d 100644
--- a/src/_VisualDVM/Passes/All/DownloadBugReport.java
+++ b/src/_VisualDVM/Passes/All/DownloadBugReport.java
@@ -3,7 +3,7 @@ import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
 import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.BugReportInterface;
+import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 public class DownloadBugReport extends ComponentsRepositoryPass<BugReport> {
diff --git a/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java b/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java
index 9e7aa49d..8930fb2e 100644
--- a/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java
+++ b/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java
@@ -5,7 +5,7 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.BugReportInterface;
+import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
 
 import java.io.File;
 import java.nio.file.Paths;
diff --git a/src/_VisualDVM/Passes/All/PublishBugReport.java b/src/_VisualDVM/Passes/All/PublishBugReport.java
index 7b16efd8..4fb4fee1 100644
--- a/src/_VisualDVM/Passes/All/PublishBugReport.java
+++ b/src/_VisualDVM/Passes/All/PublishBugReport.java
@@ -6,7 +6,7 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.BugReportInterface;
+import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
 import _VisualDVM.Repository.BugReport.BugReportState;
 import _VisualDVM.Repository.EmailMessage;
 
diff --git a/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java b/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java
index 6df8ff5d..7930a7d5 100644
--- a/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java
+++ b/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Passes.All;
-import _VisualDVM.Repository.BugReport.BugReportInterface;
+import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
 public class SaveBugReportRecipients extends UpdateBugReportField {
     @Override
     public String getIconPath() {
diff --git a/src/_VisualDVM/Passes/All/SendBugReport.java b/src/_VisualDVM/Passes/All/SendBugReport.java
index 3cd6d6be..50ad57e9 100644
--- a/src/_VisualDVM/Passes/All/SendBugReport.java
+++ b/src/_VisualDVM/Passes/All/SendBugReport.java
@@ -2,7 +2,7 @@ package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
-import _VisualDVM.Repository.BugReport.BugReportInterface;
+import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
 import _VisualDVM.Repository.BugReport.BugReportState;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
diff --git a/src/_VisualDVM/Passes/All/UpdateBugReportField.java b/src/_VisualDVM/Passes/All/UpdateBugReportField.java
index 7f75dad1..773ec90e 100644
--- a/src/_VisualDVM/Passes/All/UpdateBugReportField.java
+++ b/src/_VisualDVM/Passes/All/UpdateBugReportField.java
@@ -5,7 +5,7 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
 import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.BugReportInterface;
+import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
 import _VisualDVM.Repository.BugReport.BugReportState;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.ServerCode;
diff --git a/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java b/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
index 59a2140f..d2f71186 100644
--- a/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
+++ b/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
@@ -4,6 +4,7 @@ import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import _VisualDVM.Current;
+import _VisualDVM.ProjectData.DBArray.UI.DBArraysForm;
 
 import javax.swing.*;
 public class ArraysDBTable extends DBTable<String, DBArray> {
@@ -20,29 +21,7 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{"Имя"};
-            }
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(1).setEditable(false);
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription()) {
-                    @Override
-                    public void createSelectionButtons(DataSet dataSet) {
-                        //не нужны.
-                    }
-                };
-            }
-        };
+        return new DBArraysForm(this, mountPanel);
     }
     @Override
     public Current CurrentName() {
diff --git a/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java b/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
new file mode 100644
index 00000000..81389b9a
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
@@ -0,0 +1,33 @@
+package _VisualDVM.ProjectData.DBArray.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import _VisualDVM.ProjectData.DBArray.DBArray;
+
+import javax.swing.*;
+public class DBArraysForm extends DataSetControlForm<DBArray> {
+    public DBArraysForm(DataSet<?, DBArray> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{"Имя"};
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(1).setEditable(false);
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription()) {
+            @Override
+            public void createSelectionButtons(DataSet dataSet) {
+                //не нужны.
+            }
+        };
+    }
+}
diff --git a/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java b/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
index 69048ebc..b604cd52 100644
--- a/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
+++ b/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
@@ -8,7 +8,7 @@ import _VisualDVM.Global;
 import javax.swing.*;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
-public class MessagesControlForm extends DataSetControlForm {
+public class MessagesControlForm extends DataSetControlForm<Message> {
     public MessagesControlForm(DataSet dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
     }
diff --git a/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java b/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
index b52f69ef..e0a2a08f 100644
--- a/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
+++ b/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
@@ -5,6 +5,7 @@ import Common.Visual.Tables.RendererWrapText;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.ProjectData.Messages.Recommendations.UI.RecommendationsForm;
 
 import javax.swing.*;
 public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
@@ -16,22 +17,7 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{"текст"};
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-                columns.get(1).setMinWidth(700);
-                columns.get(1).setRendererClass(RendererWrapText.class);
-            }
-            @Override
-            public boolean hasMenuBar() {
-                return false;
-            }
-        };
+        return new RecommendationsForm(this, mountPanel);
     }
     @Override
     public String getSingleDescription() {
diff --git a/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java b/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java
new file mode 100644
index 00000000..b15ca3ad
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java
@@ -0,0 +1,26 @@
+package _VisualDVM.ProjectData.Messages.Recommendations.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Tables.RendererWrapText;
+import _VisualDVM.ProjectData.Messages.Recommendations.MessageRecommendation;
+
+import javax.swing.*;
+public class RecommendationsForm extends DataSetControlForm<MessageRecommendation> {
+    public RecommendationsForm(DataSet<?, MessageRecommendation> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{"текст"};
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(0).setVisible(false);
+        columns.get(1).setMinWidth(700);
+        columns.get(1).setRendererClass(RendererWrapText.class);
+    }
+    @Override
+    public boolean hasMenuBar() {
+        return false;
+    }
+}
diff --git a/src/_VisualDVM/ProjectData/Project/db_project_info.java b/src/_VisualDVM/ProjectData/Project/db_project_info.java
index dbe18976..46e3d68a 100644
--- a/src/_VisualDVM/ProjectData/Project/db_project_info.java
+++ b/src/_VisualDVM/ProjectData/Project/db_project_info.java
@@ -23,7 +23,7 @@ import _VisualDVM.ProjectData.Messages.Notes.MessageNote;
 import _VisualDVM.ProjectData.Messages.Recommendations.MessageRecommendation;
 import _VisualDVM.ProjectData.Messages.Warnings.MessageWarning;
 import _VisualDVM.ProjectData.ProjectDatabase;
-import _VisualDVM.ProjectData.SapforData.Arrays.ArraysSet;
+import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArraysSet;
 import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncCallH;
@@ -31,9 +31,9 @@ import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
 import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.GraphInfo;
 import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
-import _VisualDVM.ProjectData.SapforData.Regions.RegionsSet;
+import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegionsSet;
 import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
-import _VisualDVM.ProjectData.SapforData.Variants.VariantsSet;
+import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariantsSet;
 import _VisualDVM.TestingSystem.Common.Test.ProjectFiles_json;
 import _VisualDVM.Utils;
 import com.mxgraph.swing.mxGraphComponent;
@@ -118,7 +118,7 @@ public class db_project_info extends DBObject {
     public boolean isNew = false; //для выделения только что построенных версий.
     //------------------------------------
     //тут ключ - идентификатор. не меняем.
-    public ArraysSet declaratedArrays = new ArraysSet();
+    public ProjectArraysSet declaratedArrays = new ProjectArraysSet();
     //new - все объявленные в проекте функции.
     public FuncInfo main_function = null;
     public FuncCallH main_functionH = null;
@@ -128,8 +128,8 @@ public class db_project_info extends DBObject {
     public LinkedHashMap<String, FileInfo> addictedFiles = new LinkedHashMap<>();
     //тут ключ -адрес. меняем
     public Vector<ProjectArray> templates = new Vector<>();
-    public RegionsSet parallelRegions = new RegionsSet();
-    public VariantsSet parallelVariants = new VariantsSet();
+    public ParallelRegionsSet parallelRegions = new ParallelRegionsSet();
+    public ParallelVariantsSet parallelVariants = new ParallelVariantsSet();
     public GraphInfo functionsGraph = new GraphInfo();
     public Vector<String> files_order = new Vector<>();
     public db_project_info last_modification = null;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
deleted file mode 100644
index b23135be..00000000
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package _VisualDVM.ProjectData.SapforData.Arrays;
-import Common.Database.Tables.DataSet;
-import Common.Visual.DataSetControlForm;
-import Common.Visual.Tables.RendererHiddenList;
-import _VisualDVM.Current;
-import _VisualDVM.Global;
-import _VisualDVM.GlobalData.Settings.SettingName;
-import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Visual.Tables.EditorFilesHyperlinks;
-import _VisualDVM.Visual.Tables.RendererHyperlinks;
-
-import javax.swing.*;
-import java.util.Vector;
-public class ArraysSet extends DataSet<Long, ProjectArray> {
-    public ArraysSet() {
-        super(Long.class, ProjectArray.class);
-    }
-    @Override
-    public String getSingleDescription() {
-        return "массив";
-    }
-    @Override
-    public String getPluralDescription() {
-        return "объявленные массивы";
-    }
-    @Override
-    public Current CurrentName() {
-        return Current.ProjectArray;
-    }
-    @Override
-    protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Имя",
-                        "Область описания",
-                        "Файлы объявления",
-                        "Размерность",
-                        "Размер элемента(байт)",
-                        "Область распараллеливания"
-                };
-            }
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-                if ((Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) {
-                    columns.get(4).setRendererClass(RendererHyperlinks.class);
-                    columns.get(4).setEditorClass(EditorFilesHyperlinks.class);
-                } else {
-                    columns.get(4).setRendererClass(RendererHiddenList.class);
-                    columns.get(4).setMaxWidth(200);
-                }
-            }
-        };
-    }
-    @Override
-    public void SelectAll(boolean flag) {
-        Global.mainModule.getPass(PassCode.MassSelectArrays).Do(flag, new Vector(Global.mainModule.getProject().declaratedArrays.Data.values()));
-    }
-}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java
new file mode 100644
index 00000000..3cf7f7ea
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java
@@ -0,0 +1,35 @@
+package _VisualDVM.ProjectData.SapforData.Arrays;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import _VisualDVM.Current;
+import _VisualDVM.Global;
+import _VisualDVM.Passes.PassCode;
+import _VisualDVM.ProjectData.SapforData.Arrays.UI.ProjectArraysForm;
+
+import javax.swing.*;
+import java.util.Vector;
+public class ProjectArraysSet extends DataSet<Long, ProjectArray> {
+    public ProjectArraysSet() {
+        super(Long.class, ProjectArray.class);
+    }
+    @Override
+    public String getSingleDescription() {
+        return "массив";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "объявленные массивы";
+    }
+    @Override
+    public Current CurrentName() {
+        return Current.ProjectArray;
+    }
+    @Override
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new ProjectArraysForm(this, mountPanel);
+    }
+    @Override
+    public void SelectAll(boolean flag) {
+        Global.mainModule.getPass(PassCode.MassSelectArrays).Do(flag, new Vector(Global.mainModule.getProject().declaratedArrays.Data.values()));
+    }
+}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
new file mode 100644
index 00000000..55826b95
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
@@ -0,0 +1,42 @@
+package _VisualDVM.ProjectData.SapforData.Arrays.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Tables.RendererHiddenList;
+import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Settings.SettingName;
+import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
+import _VisualDVM.Visual.Tables.EditorFilesHyperlinks;
+import _VisualDVM.Visual.Tables.RendererHyperlinks;
+
+import javax.swing.*;
+public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
+    public ProjectArraysForm(DataSet<?, ProjectArray> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Имя",
+                "Область описания",
+                "Файлы объявления",
+                "Размерность",
+                "Размер элемента(байт)",
+                "Область распараллеливания"
+        };
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(0).setVisible(false);
+        if ((Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) {
+            columns.get(4).setRendererClass(RendererHyperlinks.class);
+            columns.get(4).setEditorClass(EditorFilesHyperlinks.class);
+        } else {
+            columns.get(4).setRendererClass(RendererHiddenList.class);
+            columns.get(4).setMaxWidth(200);
+        }
+    }
+}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java b/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java
new file mode 100644
index 00000000..ec432dd5
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java
@@ -0,0 +1,32 @@
+package _VisualDVM.ProjectData.SapforData.Regions;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Tables.RendererMultiline;
+import Common.Visual.Tables.RendererTopLeft;
+import _VisualDVM.Current;
+import _VisualDVM.ProjectData.SapforData.Regions.UI.ParallelRegionsForm;
+
+import javax.swing.*;
+import java.math.BigInteger;
+public class ParallelRegionsSet extends DataSet<BigInteger, ParallelRegion> {
+    //суррогат. нужен только для сохры столбцов. во всяком случае пока.
+    public ParallelRegionsSet() {
+        super(BigInteger.class, ParallelRegion.class);
+    }
+    @Override
+    public Current CurrentName() {
+        return Current.ParallelRegionInfo;
+    }
+    @Override
+    public String getSingleDescription() {
+        return "область распараллеливания";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "области распараллеливания";
+    }
+    @Override
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new ParallelRegionsForm(this, mountPanel) ;
+    }
+}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java b/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
deleted file mode 100644
index 193b5cea..00000000
--- a/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package _VisualDVM.ProjectData.SapforData.Regions;
-import Common.Database.Tables.DataSet;
-import Common.Visual.DataSetControlForm;
-import Common.Visual.Tables.RendererMultiline;
-import Common.Visual.Tables.RendererTopLeft;
-import _VisualDVM.Current;
-
-import javax.swing.*;
-import java.math.BigInteger;
-public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
-    //суррогат. нужен только для сохры столбцов. во всяком случае пока.
-    public RegionsSet() {
-        super(BigInteger.class, ParallelRegion.class);
-    }
-    @Override
-    public Current CurrentName() {
-        return Current.ParallelRegionInfo;
-    }
-    @Override
-    public String getSingleDescription() {
-        return "область распараллеливания";
-    }
-    @Override
-    public String getPluralDescription() {
-        return "области распараллеливания";
-    }
-    @Override
-    protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Имя",
-                        "Строк кода",
-                        "Массивов",
-                        "Циклов",
-                        "Объявлений процедур",
-                        "Вызовов процедур",
-                        "Фрагменты"};
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-                for (int i = 1; i < 7; ++i)
-                    columns.get(i).setRendererClass(RendererTopLeft.class);
-                columns.get(7).setRendererClass(RendererMultiline.class);
-            }
-        };
-    }
-}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java b/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java
new file mode 100644
index 00000000..0300d4ac
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java
@@ -0,0 +1,31 @@
+package _VisualDVM.ProjectData.SapforData.Regions.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Tables.RendererMultiline;
+import Common.Visual.Tables.RendererTopLeft;
+import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
+
+import javax.swing.*;
+public class ParallelRegionsForm extends DataSetControlForm<ParallelRegion> {
+    public ParallelRegionsForm(DataSet<?, ParallelRegion> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Имя",
+                "Строк кода",
+                "Массивов",
+                "Циклов",
+                "Объявлений процедур",
+                "Вызовов процедур",
+                "Фрагменты"};
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(0).setVisible(false);
+        for (int i = 1; i < 7; ++i)
+            columns.get(i).setRendererClass(RendererTopLeft.class);
+        columns.get(7).setRendererClass(RendererMultiline.class);
+    }
+}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java b/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java
new file mode 100644
index 00000000..4b6b1fb8
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java
@@ -0,0 +1,24 @@
+package _VisualDVM.ProjectData.SapforData.Variants;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import _VisualDVM.Current;
+import _VisualDVM.ProjectData.SapforData.Variants.UI.ParallelVariantsForm;
+
+import javax.swing.*;
+public class ParallelVariantsSet extends DataSet<String, ParallelVariant> {
+    public ParallelVariantsSet() {
+        super(String.class, ParallelVariant.class);
+    }
+    @Override
+    public String getPluralDescription() {
+        return "варианты";
+    }
+    @Override
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new ParallelVariantsForm(this, mountPanel);
+    }
+    @Override
+    public Current CurrentName() {
+        return Current.ParallelVariant;
+    }
+}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java b/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
new file mode 100644
index 00000000..46a3cc66
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
@@ -0,0 +1,53 @@
+package _VisualDVM.ProjectData.SapforData.Variants.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.RendererDate;
+import Common.Visual.Tables.RendererMaskedNanInteger;
+import Common.Visual.Tables.RendererMultiline;
+import _VisualDVM.Passes.PassCode;
+import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
+
+import javax.swing.*;
+public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
+    public ParallelVariantsForm(DataSet<?, ParallelVariant> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Распределение",
+                "PARALLEL",
+                "REMOTE",
+                "REDISTRIBUTE",
+                "INTERVALS",
+                "PS.REMOTE",
+                "PS.SHADOW",
+                "PS.REDUCTION",
+                "PS.ACROSS",
+                "Оценка",
+                "Дата оценки",
+                "Версия"};
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(0).setVisible(false);
+        columns.get(2).setRendererClass(RendererMultiline.class);
+        for (int i = 3; i < columns.size() - 3; ++i)
+            columns.get(i).setRendererClass(RendererMaskedNanInteger.class);
+        columns.get(columns.size() - 3).setRendererClass(RendererVariantRank.class);
+        columns.get(columns.size() - 2).setRendererClass(RendererDate.class);
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(),
+                PassCode.ShowAllParallelVariants,
+                PassCode.ShowParallelVariantsCoverage,
+                PassCode.PredictParallelVariants,
+                PassCode.CreateParallelVariants);
+    }
+}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java b/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java
deleted file mode 100644
index 47197af7..00000000
--- a/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package _VisualDVM.ProjectData.SapforData.Variants;
-import Common.Database.Tables.DataSet;
-import Common.Visual.DataSetControlForm;
-import Common.Visual.Menus.DataMenuBar;
-import Common.Visual.Tables.RendererDate;
-import Common.Visual.Tables.RendererMaskedNanInteger;
-import Common.Visual.Tables.RendererMultiline;
-import _VisualDVM.Current;
-import _VisualDVM.Passes.PassCode;
-import _VisualDVM.ProjectData.SapforData.Variants.UI.RendererVariantRank;
-
-import javax.swing.*;
-public class VariantsSet extends DataSet<String, ParallelVariant> {
-    public VariantsSet() {
-        super(String.class, ParallelVariant.class);
-    }
-    @Override
-    public String getPluralDescription() {
-        return "варианты";
-    }
-    @Override
-    protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Распределение",
-                        "PARALLEL",
-                        "REMOTE",
-                        "REDISTRIBUTE",
-                        "INTERVALS",
-                        "PS.REMOTE",
-                        "PS.SHADOW",
-                        "PS.REDUCTION",
-                        "PS.ACROSS",
-                        "Оценка",
-                        "Дата оценки",
-                        "Версия"};
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-                columns.get(2).setRendererClass(RendererMultiline.class);
-                for (int i = 3; i < columns.size() - 3; ++i)
-                    columns.get(i).setRendererClass(RendererMaskedNanInteger.class);
-                columns.get(columns.size() - 3).setRendererClass(RendererVariantRank.class);
-                columns.get(columns.size() - 2).setRendererClass(RendererDate.class);
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(),
-                        PassCode.ShowAllParallelVariants,
-                        PassCode.ShowParallelVariantsCoverage,
-                        PassCode.PredictParallelVariants,
-                        PassCode.CreateParallelVariants);
-            }
-        };
-    }
-    @Override
-    public Current CurrentName() {
-        return Current.ParallelVariant;
-    }
-}
diff --git a/src/_VisualDVM/Repository/BugReport/BugReport.java b/src/_VisualDVM/Repository/BugReport/BugReport.java
index b29e6e1d..593fffea 100644
--- a/src/_VisualDVM/Repository/BugReport/BugReport.java
+++ b/src/_VisualDVM/Repository/BugReport/BugReport.java
@@ -2,6 +2,7 @@ package _VisualDVM.Repository.BugReport;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.rDBObject;
 import _VisualDVM.Global;
+import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
 import _VisualDVM.Repository.Component.ComponentType;
 import com.sun.org.glassfish.gmbal.Description;
 
diff --git a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
index 31887781..26414eac 100644
--- a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
+++ b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
@@ -2,17 +2,11 @@ package _VisualDVM.Repository.BugReport;
 import Common.Database.Tables.DBTable;
 import Common.Passes.PassCode_;
 import Common.Visual.DataSetControlForm;
-import Common.Visual.Menus.DataMenuBar;
-import Common.Visual.Tables.RendererDate;
-import Common.Visual.Tables.RendererProgressBar;
-import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.Current;
-import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.Repository.BugReport.UI.BugReportsForm;
 
 import javax.swing.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
 import java.util.Comparator;
 import java.util.Vector;
 import java.util.stream.Collectors;
@@ -30,69 +24,7 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Описание",
-                        "Отправитель",
-                        "Исполнитель",
-                        "Проект",
-                        "Завершенность",
-                        "Дата создания",
-                        "Дата изменения",
-                        "Статус"};
-            }
-            @Override
-            public void ShowCurrentObject() throws Exception {
-                super.ShowCurrentObject();
-                Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
-            }
-            @Override
-            public void ShowNoCurrentObject() throws Exception {
-                super.ShowNoCurrentObject();
-                Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowNoCurrentBugReport();
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(1).setMaxWidth(600);
-                columns.get(5).setRendererClass(RendererProgressBar.class);
-                columns.get(6).setRendererClass(RendererDate.class);
-                columns.get(7).setRendererClass(RendererDate.class);
-                columns.get(8).setRendererClass(RendererStatusEnum.class);
-            }
-            @Override
-            public void MouseAction2() throws Exception {
-                Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
-            }
-            @Override
-            protected void createControl() {
-                //https://stackoverflow.com/questions/9091208/jtable-enter-key
-                super.createControl();
-                final String solve = "Solve";
-                KeyStroke enter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0);
-                control.getInputMap(JTable.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(enter, solve);
-                control.getActionMap().put(solve, new AbstractAction() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
-                    }
-                });
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(),
-                        PassCode.SynchronizeBugReports,
-                        PassCode.DownloadAllBugReportsArchives,
-                        PassCode.AddBugReport,
-                        PassCode.PublishBugReport,
-                        PassCode.OpenBugReportTestProject,
-                        PassCode.OpenBugReport,
-                        PassCode.UpdateBugReportProgress,
-                        PassCode.CloseBugReport,
-                        PassCode.DeleteBugReport);
-            }
-        };
+        return new BugReportsForm(this, mountPanel);
     }
     @Override
     public Comparator<BugReport> getComparator() {
diff --git a/src/_VisualDVM/Repository/BugReport/BugReportInterface.java b/src/_VisualDVM/Repository/BugReport/UI/BugReportInterface.java
similarity index 96%
rename from src/_VisualDVM/Repository/BugReport/BugReportInterface.java
rename to src/_VisualDVM/Repository/BugReport/UI/BugReportInterface.java
index d1c1c9d9..df16ae45 100644
--- a/src/_VisualDVM/Repository/BugReport/BugReportInterface.java
+++ b/src/_VisualDVM/Repository/BugReport/UI/BugReportInterface.java
@@ -1,13 +1,16 @@
-package _VisualDVM.Repository.BugReport;
+package _VisualDVM.Repository.BugReport.UI;
 import Common.Utils.TextLog;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
+import _VisualDVM.Repository.BugReport.BugReport;
+import _VisualDVM.Repository.BugReport.BugReportState;
 import _VisualDVM.Repository.RepositoryServer;
 import _VisualDVM.Repository.Subscribes.Subscriber;
 
 import java.io.File;
 import java.nio.file.Paths;
 import java.util.Vector;
+//todo слить с формой.
 public class BugReportInterface {
     public static String filterKey = "";
     public static String filterSenderName = "";
diff --git a/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java b/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
new file mode 100644
index 00000000..b1e238f8
--- /dev/null
+++ b/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
@@ -0,0 +1,80 @@
+package _VisualDVM.Repository.BugReport.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.RendererDate;
+import Common.Visual.Tables.RendererProgressBar;
+import Common.Visual.Tables.RendererStatusEnum;
+import _VisualDVM.Global;
+import _VisualDVM.Passes.PassCode;
+import _VisualDVM.Repository.BugReport.BugReport;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+public class BugReportsForm extends DataSetControlForm<BugReport> {
+    public BugReportsForm(DataSet<?, BugReport> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Описание",
+                "Отправитель",
+                "Исполнитель",
+                "Проект",
+                "Завершенность",
+                "Дата создания",
+                "Дата изменения",
+                "Статус"};
+    }
+    @Override
+    public void ShowCurrentObject() throws Exception {
+        super.ShowCurrentObject();
+        Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
+    }
+    @Override
+    public void ShowNoCurrentObject() throws Exception {
+        super.ShowNoCurrentObject();
+        Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowNoCurrentBugReport();
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(1).setMaxWidth(600);
+        columns.get(5).setRendererClass(RendererProgressBar.class);
+        columns.get(6).setRendererClass(RendererDate.class);
+        columns.get(7).setRendererClass(RendererDate.class);
+        columns.get(8).setRendererClass(RendererStatusEnum.class);
+    }
+    @Override
+    public void MouseAction2() throws Exception {
+        Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
+    }
+    @Override
+    protected void createControl() {
+        //https://stackoverflow.com/questions/9091208/jtable-enter-key
+        super.createControl();
+        final String solve = "Solve";
+        KeyStroke enter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0);
+        control.getInputMap(JTable.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(enter, solve);
+        control.getActionMap().put(solve, new AbstractAction() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
+            }
+        });
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(),
+                PassCode.SynchronizeBugReports,
+                PassCode.DownloadAllBugReportsArchives,
+                PassCode.AddBugReport,
+                PassCode.PublishBugReport,
+                PassCode.OpenBugReportTestProject,
+                PassCode.OpenBugReport,
+                PassCode.UpdateBugReportProgress,
+                PassCode.CloseBugReport,
+                PassCode.DeleteBugReport);
+    }
+}
diff --git a/src/_VisualDVM/Repository/Component/ComponentsSet.java b/src/_VisualDVM/Repository/Component/ComponentsSet.java
index c2dd98ae..cbb63da4 100644
--- a/src/_VisualDVM/Repository/Component/ComponentsSet.java
+++ b/src/_VisualDVM/Repository/Component/ComponentsSet.java
@@ -10,6 +10,7 @@ import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.Repository.Component.UI.ComponentsForm;
 
 import javax.swing.*;
 import java.util.Vector;
@@ -27,49 +28,7 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Компонент",
-                        "Текущая версия",
-                        "Актуальная версия",
-                        "Дата сборки",
-                        "Статус"};
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-                columns.get(3).setRendererClass(RendererMaskedNanInteger.class);
-                columns.get(4).setRendererClass(RendererMaskedNanInteger.class);
-                columns.get(6).setRendererClass(RendererStatusEnum.class);
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(), PassCode.InstallComponentFromFolder,
-                        PassCode.UpdateSelectedComponents,
-                        PassCode.PublishComponent,
-                        PassCode.ShowComponentChangesLog) {
-                    {
-                        addMenus(
-                                new VisualiserMenu(
-                                        "Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
-                                    {
-                                        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
-                                        add(Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem());
-                                        add(Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem());
-                                    }
-                                }
-                        );
-                        Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
-                    }
-                };
-            }
-        };
+        return new ComponentsForm(this, mountPanel);
     }
     @Override
     public Current CurrentName() {
diff --git a/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java b/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
index ed1e830a..92efbfbb 100644
--- a/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
+++ b/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
@@ -1,43 +1,60 @@
 package _VisualDVM.Repository.Component.UI;
-import Common.Visual.Windows.Dialog.Dialog;
+import Common.Database.Tables.DataSet;
+import Common.MainModule_;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Fonts.VisualiserFonts;
+import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Menus.VisualiserMenu;
+import Common.Visual.Tables.RendererMaskedNanInteger;
+import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.Global;
+import _VisualDVM.Passes.PassCode;
+import _VisualDVM.Repository.Component.Component;
 
-import java.awt.*;
-public class ComponentsForm extends Dialog<Object, ComponentsFields> {
-    public ComponentsForm() {
-        super(ComponentsFields.class);
+import javax.swing.*;
+public class ComponentsForm extends DataSetControlForm<Component> {
+    public ComponentsForm(DataSet<?, Component> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
     }
     @Override
-    public boolean NeedsScroll() {
-        return false;
+    public boolean hasCheckBox() {
+        return true;
     }
     @Override
-    public int getDefaultWidth() {
-        return Global.properties.ComponentsWindowWidth;
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Компонент",
+                "Текущая версия",
+                "Актуальная версия",
+                "Дата сборки",
+                "Статус"};
     }
     @Override
-    public int getDefaultHeight() {
-        return Global.properties.ComponentsWindowHeight;
+    protected void AdditionalInitColumns() {
+        columns.get(0).setVisible(false);
+        columns.get(3).setRendererClass(RendererMaskedNanInteger.class);
+        columns.get(4).setRendererClass(RendererMaskedNanInteger.class);
+        columns.get(6).setRendererClass(RendererStatusEnum.class);
     }
     @Override
-    public void CreateButtons() {
-    }
-    @Override
-    public void Init(Object... params) {
-        Global.Components.ShowUI();
-    }
-    @Override
-    public void LoadSize() {
-        setMinimumSize(new Dimension(650, 250));
-        Dimension dimension = new Dimension(getDefaultWidth(), getDefaultHeight());
-        setPreferredSize(dimension);
-        setSize(dimension);
-    }
-    @Override
-    public void onClose() {
-        super.onClose();
-        Global.properties.ComponentsWindowWidth = getWidth();
-        Global.properties.ComponentsWindowHeight = getHeight();
-        Global.properties.Update();
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.InstallComponentFromFolder,
+                PassCode.UpdateSelectedComponents,
+                PassCode.PublishComponent,
+                PassCode.ShowComponentChangesLog) {
+            {
+                addMenus(
+                        new VisualiserMenu(
+                                "Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
+                            {
+                                setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
+                                add(Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem());
+                                add(Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem());
+                            }
+                        }
+                );
+                Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
+            }
+        };
     }
 }
diff --git a/src/_VisualDVM/Repository/Component/UI/ComponentsWindow.java b/src/_VisualDVM/Repository/Component/UI/ComponentsWindow.java
new file mode 100644
index 00000000..2ab3968a
--- /dev/null
+++ b/src/_VisualDVM/Repository/Component/UI/ComponentsWindow.java
@@ -0,0 +1,43 @@
+package _VisualDVM.Repository.Component.UI;
+import Common.Visual.Windows.Dialog.Dialog;
+import _VisualDVM.Global;
+
+import java.awt.*;
+public class ComponentsWindow extends Dialog<Object, ComponentsFields> {
+    public ComponentsWindow() {
+        super(ComponentsFields.class);
+    }
+    @Override
+    public boolean NeedsScroll() {
+        return false;
+    }
+    @Override
+    public int getDefaultWidth() {
+        return Global.properties.ComponentsWindowWidth;
+    }
+    @Override
+    public int getDefaultHeight() {
+        return Global.properties.ComponentsWindowHeight;
+    }
+    @Override
+    public void CreateButtons() {
+    }
+    @Override
+    public void Init(Object... params) {
+        Global.Components.ShowUI();
+    }
+    @Override
+    public void LoadSize() {
+        setMinimumSize(new Dimension(650, 250));
+        Dimension dimension = new Dimension(getDefaultWidth(), getDefaultHeight());
+        setPreferredSize(dimension);
+        setSize(dimension);
+    }
+    @Override
+    public void onClose() {
+        super.onClose();
+        Global.properties.ComponentsWindowWidth = getWidth();
+        Global.properties.ComponentsWindowHeight = getHeight();
+        Global.properties.Update();
+    }
+}
diff --git a/src/_VisualDVM/Repository/Server/ComponentsServer.java b/src/_VisualDVM/Repository/Server/ComponentsServer.java
index d7a7a047..dacc2696 100644
--- a/src/_VisualDVM/Repository/Server/ComponentsServer.java
+++ b/src/_VisualDVM/Repository/Server/ComponentsServer.java
@@ -13,7 +13,7 @@ import _VisualDVM.Passes.All.UnzipFolderPass;
 import _VisualDVM.Passes.All.ZipFolderPass;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.BugReportInterface;
+import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
 import _VisualDVM.Repository.BugReportsDatabase;
 import _VisualDVM.Repository.Component.ComponentType;
 import _VisualDVM.Repository.EmailMessage;
diff --git a/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java b/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
index 9843270e..5a9a97b9 100644
--- a/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
+++ b/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
@@ -15,6 +15,7 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
 import _VisualDVM.Repository.Subscribes.UI.SubscriberFields;
 import _VisualDVM.Repository.Subscribes.UI.SubscriberForm;
+import _VisualDVM.Repository.Subscribes.UI.SubsribersForm;
 
 import javax.swing.*;
 import java.util.LinkedHashMap;
@@ -32,36 +33,7 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Имя",
-                        "Роль",
-                        "Рассылка"};
-            }
-            @Override
-            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(3).setVisible(admin);
-                columns.get(4).setVisible(admin);
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(),
-                        PassCode.SaveBugReportExecutor,
-                        PassCode.SaveBugReportRecipients,
-                        PassCode.AddSubscriber,
-                        PassCode.EditSubscriber,
-                        PassCode.DeleteSubscriber);
-            }
-        };
+        return new SubsribersForm(this, mountPanel);
     }
     @Override
     public Current CurrentName() {
diff --git a/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java b/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
new file mode 100644
index 00000000..f27a441c
--- /dev/null
+++ b/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
@@ -0,0 +1,43 @@
+package _VisualDVM.Repository.Subscribes.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Account.AccountRole;
+import _VisualDVM.Passes.PassCode;
+import _VisualDVM.Repository.Subscribes.Subscriber;
+
+import javax.swing.*;
+public class SubsribersForm extends DataSetControlForm<Subscriber> {
+    public SubsribersForm(DataSet<?, Subscriber> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Имя",
+                "Роль",
+                "Рассылка"};
+    }
+    @Override
+    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(3).setVisible(admin);
+        columns.get(4).setVisible(admin);
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(),
+                PassCode.SaveBugReportExecutor,
+                PassCode.SaveBugReportRecipients,
+                PassCode.AddSubscriber,
+                PassCode.EditSubscriber,
+                PassCode.DeleteSubscriber);
+    }
+}
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
index e6032d36..c7d31ef8 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
@@ -12,6 +12,7 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields;
+import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.DVMConfigurationsForm;
 
 import javax.swing.*;
 public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
@@ -32,42 +33,8 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "имя",
-                        "автор",
-                        "ядра",
-                        "параметры",
-                        "группы",
-                        "тестов",
-                        "компиляция(с)",
-                        "запуск(с)"
-                };
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(6).setRendererClass(RendererMultiline.class);
-                columns.get(6).setMaxWidth(500);
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(),
-                        PassCode.PublishConfiguration,
-                        PassCode.EditConfiguration,
-                        PassCode.ShowCurrentDVMConfigurationTests,
-                        PassCode.SaveCurrentDVMConfiguration,
-                        PassCode.DeleteConfiguration,
-                        PassCode.StartSelectedDVMConfigurations);
-            }
-        };
+        return new DVMConfigurationsForm(this, mountPanel);
     }
-
     @Override
     public DBObjectDialog<DVMConfiguration, ConfigurationFields> getDialog() {
         return new DBObjectDialog<DVMConfiguration, ConfigurationFields>(ConfigurationFields.class) {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
new file mode 100644
index 00000000..96e46c59
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
@@ -0,0 +1,46 @@
+package _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.RendererMultiline;
+import _VisualDVM.Passes.PassCode;
+import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
+
+import javax.swing.*;
+public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration> {
+    public DVMConfigurationsForm(DataSet<?, DVMConfiguration> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "имя",
+                "автор",
+                "ядра",
+                "параметры",
+                "группы",
+                "тестов",
+                "компиляция(с)",
+                "запуск(с)"
+        };
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(6).setRendererClass(RendererMultiline.class);
+        columns.get(6).setMaxWidth(500);
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(),
+                PassCode.PublishConfiguration,
+                PassCode.EditConfiguration,
+                PassCode.ShowCurrentDVMConfigurationTests,
+                PassCode.SaveCurrentDVMConfiguration,
+                PassCode.DeleteConfiguration,
+                PassCode.StartSelectedDVMConfigurations);
+    }
+}
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index b793ccbb..e0315595 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -14,6 +14,7 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.PackageCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
+import _VisualDVM.TestingSystem.DVM.DVMPackage.UI.DVMPackagesForm;
 
 import javax.swing.*;
 import java.util.Comparator;
@@ -38,99 +39,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Автор",
-                        "Машина",
-                        "Пользователь",
-                        "DVM",
-                        "Конфигурации",
-                        "Задач",
-                        "Ядер",
-                        "Прогресс",
-                        "Начало",
-                        "Изменено",
-                        "Статус"
-                };
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(6).setRendererClass(RendererMultiline.class);
-                columns.get(9).setRendererClass(RendererProgressBar.class);
-                columns.get(10).setRendererClass(RendererDate.class);
-                columns.get(11).setRendererClass(RendererDate.class);
-                columns.get(12).setRendererClass(RendererStatusEnum.class);
-            }
-            @Override
-            public void ShowCurrentObject() throws Exception {
-                super.ShowCurrentObject();
-                //--
-                Global.testingServer.db.dvmRunTasks.ShowDVMPackage(getCurrent());
-                Global.mainModule.getUI().getMainWindow().getTestingWindow().DropTestRunTasksComparison();
-                //--
-            }
-            @Override
-            public void ShowNoCurrentObject() throws Exception {
-                super.ShowNoCurrentObject();
-                Global.testingServer.db.dvmRunTasks.ShowNoPackage();
-                Global.mainModule.getUI().getMainWindow().getTestingWindow().DropTestRunTasksComparison();
-            }
-            @Override
-            public void MouseAction2() throws Exception {
-                Global.mainModule.getPass(PassCode.DownloadDVMPackage).Do();
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription()) {
-                    {
-                        addPasses(PassCode.SynchronizeTests);
-                        addSeparator();
-                        addPasses(PassCode.AbortDVMPackage);
-                        addSeparator();
-                        addPasses(PassCode.DownloadDVMPackage,
-                                PassCode.ExportDVMPackageToExcel,
-                                PassCode.DeleteDVMPackage);
-                        add(new JSeparator());
-                        add(new MenuBarButton() {
-                            {
-                                setText("Свои");
-                                setToolTipText("Отображать только пакеты тестов авторства пользователя");
-                                Mark();
-                                addActionListener(e -> {
-                                    DVMPackageDBTable.filterMyOnly = !DVMPackageDBTable.filterMyOnly;
-                                    Mark();
-                                    Global.testingServer.db.dvmPackages.ShowUI();
-                                });
-                            }
-                            public void Mark() {
-                                setIcon(Utils_.getIcon(DVMPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
-                            }
-                        });
-                        add(new MenuBarButton() {
-                            {
-                                setText("Активные");
-                                setToolTipText("Отображать только активные пакеты тестов");
-                                Mark();
-                                addActionListener(e -> {
-                                    DVMPackageDBTable.filterActive = !DVMPackageDBTable.filterActive;
-                                    Mark();
-                                    Global.testingServer.db.dvmPackages.ShowUI();
-                                });
-                            }
-                            public void Mark() {
-                                setIcon(Utils_.getIcon(DVMPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
-                            }
-                        });
-                    }
-                };
-            }
-        };
+        return new DVMPackagesForm(this, mountPanel);
     }
     @Override
     public Comparator<DVMPackage> getComparator() {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
new file mode 100644
index 00000000..0d1a4bca
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
@@ -0,0 +1,112 @@
+package _VisualDVM.TestingSystem.DVM.DVMPackage.UI;
+import Common.Database.Tables.DataSet;
+import Common.Utils.Utils_;
+import Common.Visual.Controls.MenuBarButton;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.RendererDate;
+import Common.Visual.Tables.RendererMultiline;
+import Common.Visual.Tables.RendererProgressBar;
+import Common.Visual.Tables.RendererStatusEnum;
+import _VisualDVM.Global;
+import _VisualDVM.Passes.PassCode;
+import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
+import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
+
+import javax.swing.*;
+public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
+    public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Автор",
+                "Машина",
+                "Пользователь",
+                "DVM",
+                "Конфигурации",
+                "Задач",
+                "Ядер",
+                "Прогресс",
+                "Начало",
+                "Изменено",
+                "Статус"
+        };
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(6).setRendererClass(RendererMultiline.class);
+        columns.get(9).setRendererClass(RendererProgressBar.class);
+        columns.get(10).setRendererClass(RendererDate.class);
+        columns.get(11).setRendererClass(RendererDate.class);
+        columns.get(12).setRendererClass(RendererStatusEnum.class);
+    }
+    @Override
+    public void ShowCurrentObject() throws Exception {
+        super.ShowCurrentObject();
+        //--
+        Global.testingServer.db.dvmRunTasks.ShowDVMPackage((DVMPackage) dataSource.getCurrent());
+        Global.mainModule.getUI().getMainWindow().getTestingWindow().DropTestRunTasksComparison();
+        //--
+    }
+    @Override
+    public void ShowNoCurrentObject() throws Exception {
+        super.ShowNoCurrentObject();
+        Global.testingServer.db.dvmRunTasks.ShowNoPackage();
+        Global.mainModule.getUI().getMainWindow().getTestingWindow().DropTestRunTasksComparison();
+    }
+    @Override
+    public void MouseAction2() throws Exception {
+        Global.mainModule.getPass(PassCode.DownloadDVMPackage).Do();
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription()) {
+            {
+                addPasses(PassCode.SynchronizeTests);
+                addSeparator();
+                addPasses(PassCode.AbortDVMPackage);
+                addSeparator();
+                addPasses(PassCode.DownloadDVMPackage,
+                        PassCode.ExportDVMPackageToExcel,
+                        PassCode.DeleteDVMPackage);
+                add(new JSeparator());
+                add(new MenuBarButton() {
+                    {
+                        setText("Свои");
+                        setToolTipText("Отображать только пакеты тестов авторства пользователя");
+                        Mark();
+                        addActionListener(e -> {
+                            DVMPackageDBTable.filterMyOnly = !DVMPackageDBTable.filterMyOnly;
+                            Mark();
+                            Global.testingServer.db.dvmPackages.ShowUI();
+                        });
+                    }
+                    public void Mark() {
+                        setIcon(Utils_.getIcon(DVMPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
+                    }
+                });
+                add(new MenuBarButton() {
+                    {
+                        setText("Активные");
+                        setToolTipText("Отображать только активные пакеты тестов");
+                        Mark();
+                        addActionListener(e -> {
+                            DVMPackageDBTable.filterActive = !DVMPackageDBTable.filterActive;
+                            Mark();
+                            Global.testingServer.db.dvmPackages.ShowUI();
+                        });
+                    }
+                    public void Mark() {
+                        setIcon(Utils_.getIcon(DVMPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
+                    }
+                });
+            }
+        };
+    }
+}
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
index 639d812f..c2aafbec 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
@@ -10,6 +10,7 @@ import _VisualDVM.Current;
 import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
+import _VisualDVM.TestingSystem.DVM.DVMTasks.UI.DVMRunTasksForm;
 
 import javax.swing.*;
 import java.util.Comparator;
@@ -29,74 +30,8 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Тест",
-                        "Язык",
-                        "Флаги",
-                        "Компиляция",
-                        "Запуск",
-                        "Матрица",
-                        "Окружение",
-                        "usr.par",
-                        "Время компиляции (с)",
-                        "Время запуска (с)",
-                        "Чистое время (с)",
-                        "Прогресс",
-                };
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(5).setRendererClass(RendererStatusEnum.class);
-                columns.get(6).setRendererClass(RendererStatusEnum.class);
-                columns.get(13).setRendererClass(RendererProgressBar.class);
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
-            }
-            @Override
-            protected void createFilters() {
-                filtersMenus.add(new DataSetFiltersMenu<DVMRunTask>("Компиляция", dataSource) {
-                    @Override
-                    public void fill() {
-                        for (TaskState state : TaskState.values()) {
-                            if (state.isVisible()) {
-                                field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
-                                    @Override
-                                    protected boolean validate(DVMRunTask object) {
-                                        return object.compilation_state.equals(state);
-                                    }
-                                });
-                            }
-                        }
-                    }
-                });
-                filtersMenus.add(new DataSetFiltersMenu<DVMRunTask>("Запуск", dataSource) {
-                    @Override
-                    public void fill() {
-                        for (TaskState state : TaskState.values()) {
-                            if (state.isVisible()) {
-                                field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
-                                    @Override
-                                    protected boolean validate(DVMRunTask object) {
-                                        return object.state.equals(state);
-                                    }
-                                });
-                            }
-                        }
-                    }
-                });
-            }
-        };
+        return new DVMRunTasksForm(this, mountPanel);
     }
-
     @Override
     public Current CurrentName() {
         return Current.DVMRunTask;
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
new file mode 100644
index 00000000..e9d5f7ed
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
@@ -0,0 +1,82 @@
+package _VisualDVM.TestingSystem.DVM.DVMTasks.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DBObjectFilter;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.DataSetFiltersMenu;
+import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.RendererProgressBar;
+import Common.Visual.Tables.RendererStatusEnum;
+import _VisualDVM.GlobalData.Tasks.TaskState;
+import _VisualDVM.Passes.PassCode;
+import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
+
+import javax.swing.*;
+public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
+    public DVMRunTasksForm(DataSet<?, DVMRunTask> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Тест",
+                "Язык",
+                "Флаги",
+                "Компиляция",
+                "Запуск",
+                "Матрица",
+                "Окружение",
+                "usr.par",
+                "Время компиляции (с)",
+                "Время запуска (с)",
+                "Чистое время (с)",
+                "Прогресс",
+        };
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(5).setRendererClass(RendererStatusEnum.class);
+        columns.get(6).setRendererClass(RendererStatusEnum.class);
+        columns.get(13).setRendererClass(RendererProgressBar.class);
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
+    }
+    @Override
+    protected void createFilters() {
+        filtersMenus.add(new DataSetFiltersMenu<DVMRunTask>("Компиляция", dataSource) {
+            @Override
+            public void fill() {
+                for (TaskState state : TaskState.values()) {
+                    if (state.isVisible()) {
+                        field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
+                            @Override
+                            protected boolean validate(DVMRunTask object) {
+                                return object.compilation_state.equals(state);
+                            }
+                        });
+                    }
+                }
+            }
+        });
+        filtersMenus.add(new DataSetFiltersMenu<DVMRunTask>("Запуск", dataSource) {
+            @Override
+            public void fill() {
+                for (TaskState state : TaskState.values()) {
+                    if (state.isVisible()) {
+                        field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
+                            @Override
+                            protected boolean validate(DVMRunTask object) {
+                                return object.state.equals(state);
+                            }
+                        });
+                    }
+                }
+            }
+        });
+    }
+}
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
index d17dd939..d6af74e2 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
@@ -11,6 +11,7 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields;
+import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationsForm;
 import _VisualDVM.Visual.Tables.RendererConfigurationAuto;
 import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto;
 
@@ -34,46 +35,8 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "имя",
-                        "автор",
-                        "",
-                        "ядра",
-                        "параметры",
-                        "группы",
-                        "тестов"
-                };
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(4).setRendererClass(RendererConfigurationAuto.class);
-                columns.get(4).setEditorClass(SwitcherConfigurationAuto.class);
-                columns.get(4).setMinWidth(25);
-                columns.get(4).setMaxWidth(25);
-                columns.get(6).setMaxWidth(500);
-                columns.get(7).setRendererClass(RendererMultiline.class);
-                columns.get(7).setMaxWidth(500);
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(),
-                        PassCode.PublishSapforConfiguration,
-                        PassCode.EditSapforConfiguration,
-                        PassCode.ShowCurrentSAPFORConfigurationTests,
-                        PassCode.SaveCurrentSAPFORConfiguration,
-                        PassCode.DeleteSapforConfiguration,
-                        PassCode.StartSelectedSAPFORConfigurations);
-            }
-        };
+        return new SapforConfigurationsForm(this, mountPanel);
     }
-
     //--
     @Override
     public DBObjectDialog<SapforConfiguration, SapforConfigurationFields> getDialog() {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
new file mode 100644
index 00000000..141f4991
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
@@ -0,0 +1,52 @@
+package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.RendererMultiline;
+import _VisualDVM.Passes.PassCode;
+import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import _VisualDVM.Visual.Tables.RendererConfigurationAuto;
+import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto;
+
+import javax.swing.*;
+public class SapforConfigurationsForm extends DataSetControlForm<SapforConfiguration> {
+    public SapforConfigurationsForm(DataSet<?, SapforConfiguration> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "имя",
+                "автор",
+                "",
+                "ядра",
+                "параметры",
+                "группы",
+                "тестов"
+        };
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(4).setRendererClass(RendererConfigurationAuto.class);
+        columns.get(4).setEditorClass(SwitcherConfigurationAuto.class);
+        columns.get(4).setMinWidth(25);
+        columns.get(4).setMaxWidth(25);
+        columns.get(6).setMaxWidth(500);
+        columns.get(7).setRendererClass(RendererMultiline.class);
+        columns.get(7).setMaxWidth(500);
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(),
+                PassCode.PublishSapforConfiguration,
+                PassCode.EditSapforConfiguration,
+                PassCode.ShowCurrentSAPFORConfigurationTests,
+                PassCode.SaveCurrentSAPFORConfiguration,
+                PassCode.DeleteSapforConfiguration,
+                PassCode.StartSelectedSAPFORConfigurations);
+    }
+}
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
index 3f880c9c..cd73425c 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
@@ -14,6 +14,7 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.PackageCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
+import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI.SapforPackagesForm;
 
 import javax.swing.*;
 import java.util.Comparator;
@@ -38,82 +39,7 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Автор",
-                        "SAPFOR",
-                        "Конфигурации",
-                        "Задач",
-                        "Ядер",
-                        "Прогресс",
-                        "Начало",
-                        "Изменено",
-                        "Статус"
-                };
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(4).setRendererClass(RendererMultiline.class);
-                columns.get(7).setRendererClass(RendererProgressBar.class);
-                columns.get(8).setRendererClass(RendererDate.class);
-                columns.get(9).setRendererClass(RendererDate.class);
-                columns.get(10).setRendererClass(RendererStatusEnum.class);
-            }
-            @Override
-            public void MouseAction2() throws Exception {
-                Global.mainModule.getPass(PassCode.CompareSapforPackages).Do();
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(), PassCode.SynchronizeTests) {
-                    {
-                        addSeparator();
-                        addPasses(PassCode.AbortSapforPackage);
-                        addSeparator();
-                        addPasses(PassCode.CompareSapforPackages);
-                        addSeparator();
-                        addPasses(PassCode.DeleteSapforPackage);
-                        add(new JSeparator());
-                        add(new MenuBarButton() {
-                            {
-                                setText("Свои");
-                                setToolTipText("Отображать только пакеты тестов авторства пользователя");
-                                Mark();
-                                addActionListener(e -> {
-                                    SapforPackageDBTable.filterMyOnly = !SapforPackageDBTable.filterMyOnly;
-                                    Mark();
-                                    Global.testingServer.db.sapforPackages.ShowUI();
-                                });
-                            }
-                            public void Mark() {
-                                setIcon(Utils_.getIcon(SapforPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
-                            }
-                        });
-                        add(new MenuBarButton() {
-                            {
-                                setText("Активные");
-                                setToolTipText("Отображать только активные пакеты тестов");
-                                Mark();
-                                addActionListener(e -> {
-                                    SapforPackageDBTable.filterActive = !SapforPackageDBTable.filterActive;
-                                    Mark();
-                                    Global.testingServer.db.sapforPackages.ShowUI();
-                                });
-                            }
-                            public void Mark() {
-                                setIcon(Utils_.getIcon(SapforPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
-                            }
-                        });
-                    }
-                };
-            }
-        };
+        return new SapforPackagesForm(this, mountPanel);
     }
 
     @Override
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
new file mode 100644
index 00000000..6d1f20e2
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
@@ -0,0 +1,95 @@
+package _VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI;
+import Common.Database.Tables.DataSet;
+import Common.Utils.Utils_;
+import Common.Visual.Controls.MenuBarButton;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.RendererDate;
+import Common.Visual.Tables.RendererMultiline;
+import Common.Visual.Tables.RendererProgressBar;
+import Common.Visual.Tables.RendererStatusEnum;
+import _VisualDVM.Global;
+import _VisualDVM.Passes.PassCode;
+import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
+import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
+
+import javax.swing.*;
+public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
+    public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Автор",
+                "SAPFOR",
+                "Конфигурации",
+                "Задач",
+                "Ядер",
+                "Прогресс",
+                "Начало",
+                "Изменено",
+                "Статус"
+        };
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(4).setRendererClass(RendererMultiline.class);
+        columns.get(7).setRendererClass(RendererProgressBar.class);
+        columns.get(8).setRendererClass(RendererDate.class);
+        columns.get(9).setRendererClass(RendererDate.class);
+        columns.get(10).setRendererClass(RendererStatusEnum.class);
+    }
+    @Override
+    public void MouseAction2() throws Exception {
+        Global.mainModule.getPass(PassCode.CompareSapforPackages).Do();
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SynchronizeTests) {
+            {
+                addSeparator();
+                addPasses(PassCode.AbortSapforPackage);
+                addSeparator();
+                addPasses(PassCode.CompareSapforPackages);
+                addSeparator();
+                addPasses(PassCode.DeleteSapforPackage);
+                add(new JSeparator());
+                add(new MenuBarButton() {
+                    {
+                        setText("Свои");
+                        setToolTipText("Отображать только пакеты тестов авторства пользователя");
+                        Mark();
+                        addActionListener(e -> {
+                            SapforPackageDBTable.filterMyOnly = !SapforPackageDBTable.filterMyOnly;
+                            Mark();
+                            Global.testingServer.db.sapforPackages.ShowUI();
+                        });
+                    }
+                    public void Mark() {
+                        setIcon(Utils_.getIcon(SapforPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
+                    }
+                });
+                add(new MenuBarButton() {
+                    {
+                        setText("Активные");
+                        setToolTipText("Отображать только активные пакеты тестов");
+                        Mark();
+                        addActionListener(e -> {
+                            SapforPackageDBTable.filterActive = !SapforPackageDBTable.filterActive;
+                            Mark();
+                            Global.testingServer.db.sapforPackages.ShowUI();
+                        });
+                    }
+                    public void Mark() {
+                        setIcon(Utils_.getIcon(SapforPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
+                    }
+                });
+            }
+        };
+    }
+}
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
index 1d0bc40b..6aa487b0 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
@@ -8,6 +8,7 @@ import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.UI.ServerSapforsForm;
 
 import javax.swing.*;
 import java.util.Comparator;
@@ -30,44 +31,7 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
 
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this, mountPanel) {
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "версия",
-                        "автор",
-                        "дата сборки",
-                        "сборка"
-                };
-            }
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(4).setRendererClass(RendererDate.class);
-                columns.get(5).setRendererClass(RendererStatusEnum.class);
-            }
-            @Override
-            public void ShowCurrentObject() throws Exception {
-                super.ShowCurrentObject();
-                Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentServerSapfor();
-            }
-            @Override
-            public void ShowNoCurrentObject() throws Exception {
-                super.ShowNoCurrentObject();
-                Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowNoServerSapfor();
-            }
-            @Override
-            public DataMenuBar createMenuBar() {
-                return new DataMenuBar(getPluralDescription(),
-                        PassCode.CompileServerSapfor,
-                        PassCode.ShowSapforCompilationOut,
-                        PassCode.ShowSapforCompilationErr,
-                        PassCode.DeleteServerSapfor);
-            }
-        };
+        return new ServerSapforsForm(this, mountPanel);
     }
     @Override
     public Comparator<ServerSapfor> getComparator() {
@@ -77,7 +41,6 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
                 return o2.id - o1.id;
             }
         };
-        // return Comparator.comparingInt(o -> o.).reversed();
     }
     @Override
     public PassCode_ getDeletePassCode() {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
new file mode 100644
index 00000000..0f2bce4e
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
@@ -0,0 +1,52 @@
+package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.UI;
+import Common.Database.Tables.DataSet;
+import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.RendererDate;
+import Common.Visual.Tables.RendererStatusEnum;
+import _VisualDVM.Global;
+import _VisualDVM.Passes.PassCode;
+import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
+
+import javax.swing.*;
+public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
+    public ServerSapforsForm(DataSet<?, ServerSapfor> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean hasCheckBox() {
+        return true;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "версия",
+                "автор",
+                "дата сборки",
+                "сборка"
+        };
+    }
+    @Override
+    protected void AdditionalInitColumns() {
+        columns.get(4).setRendererClass(RendererDate.class);
+        columns.get(5).setRendererClass(RendererStatusEnum.class);
+    }
+    @Override
+    public void ShowCurrentObject() throws Exception {
+        super.ShowCurrentObject();
+        Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentServerSapfor();
+    }
+    @Override
+    public void ShowNoCurrentObject() throws Exception {
+        super.ShowNoCurrentObject();
+        Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowNoServerSapfor();
+    }
+    @Override
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(),
+                PassCode.CompileServerSapfor,
+                PassCode.ShowSapforCompilationOut,
+                PassCode.ShowSapforCompilationErr,
+                PassCode.DeleteServerSapfor);
+    }
+}
diff --git a/src/_VisualDVM/Visual/MainUI.java b/src/_VisualDVM/Visual/MainUI.java
index fbd797d1..a2c5d357 100644
--- a/src/_VisualDVM/Visual/MainUI.java
+++ b/src/_VisualDVM/Visual/MainUI.java
@@ -2,7 +2,7 @@ package _VisualDVM.Visual;
 import Common.Visual.UIModule_;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileChooser;
-import _VisualDVM.Repository.Component.UI.ComponentsForm;
+import _VisualDVM.Repository.Component.UI.ComponentsWindow;
 import _VisualDVM.TestingSystem.Common.TestingMenuBar;
 import _VisualDVM.Visual.Interface.DebugWindow;
 import _VisualDVM.Visual.Interface.VersionsWindow;
@@ -18,7 +18,7 @@ public class MainUI extends UIModule_ {
     public VersionsWindow versionsWindow = null;
     public DebugWindow debugWindow = null;
     public RemoteFileChooser remoteFileChooser = null;
-    ComponentsForm componentsWindow = null;
+    ComponentsWindow componentsWindow = null;
     //-
     TestingMenuBar testingMenuBar = null;
     CredentialsMenuBar credentialsMenuBar = null;
@@ -52,9 +52,9 @@ public class MainUI extends UIModule_ {
     public boolean hasMainWindow() {
         return mainWindow != null;
     }
-    public ComponentsForm getComponentsWindow() {
+    public ComponentsWindow getComponentsWindow() {
         if (componentsWindow == null)
-            componentsWindow = new ComponentsForm();
+            componentsWindow = new ComponentsWindow();
         return componentsWindow;
     }
     //--
diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.java b/src/_VisualDVM/Visual/Windows/CallbackForm.java
index d5610024..f24f2d58 100644
--- a/src/_VisualDVM/Visual/Windows/CallbackForm.java
+++ b/src/_VisualDVM/Visual/Windows/CallbackForm.java
@@ -8,7 +8,7 @@ import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.BugReportInterface;
+import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
 import _VisualDVM.Repository.BugReport.BugReportState;
 import _VisualDVM.Visual.Editor.BaseEditor;
 import _VisualDVM.Visual.Editor.Viewer;
diff --git a/src/_VisualDVM/Visual/Windows/FileForm.java b/src/_VisualDVM/Visual/Windows/FileForm.java
index 26ed8379..2dd10c8f 100644
--- a/src/_VisualDVM/Visual/Windows/FileForm.java
+++ b/src/_VisualDVM/Visual/Windows/FileForm.java
@@ -1,6 +1,7 @@
 package _VisualDVM.Visual.Windows;
 import Common.CommonConstants;
 import Common.Visual.FormWithSplitters;
+import Common.Visual.Tables.DataTable;
 import Common.Visual.Trees.TreeForm;
 import Common.Visual.UI;
 import _VisualDVM.Global;
@@ -338,7 +339,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
     @Override
     public void ShowFirstError() {
         if (file.father.db.errors.getUI().getRowCount() > 0)
-            file.father.db.errors.getUI().getControl().SelectRow(0);
+            ((DataTable)file.father.db.errors.getUI().getControl()).SelectRow(0);
     }
     @Override
     public void ShowCompilationOutput() {