From 2fed4336349e13ccae75bb044c10e8d7d5ed4102 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 22 Oct 2024 19:17:01 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2=D1=8B=D1=85=20=D0=BE=D0=BF?=
 =?UTF-8?q?=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=B0=D0=BD=D0=BD?=
 =?UTF-8?q?=D1=8B=D1=85=20=D0=BE=D0=B1=D1=80=D0=B0=D1=82=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=8B.=20=D0=BD?=
 =?UTF-8?q?=D1=83=D0=B6=D0=BD=D0=BE=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D0=BF=D0=B8?=
 =?UTF-8?q?=D1=81=D0=B0=D0=BD=D0=B8=D0=B9=20=D1=82=D0=B8=D0=BF=D0=BE=D0=B2?=
 =?UTF-8?q?=D1=8B=D1=85=20=D0=BF=D1=80=D0=BE=D1=85=D0=BE=D0=B4=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 61 +++++++++++++++++++
 src/Common/Database/Tables/DataSet.java       |  7 +++
 src/Common/Visual/DataSetControlForm.java     | 18 ++----
 .../GlobalData/Compiler/CompilersDBTable.java |  8 +++
 .../GlobalData/Compiler/UI/CompilersForm.java | 10 +--
 .../DVMParameter/DVMParameterDBTable.java     |  8 +++
 .../DVMParameter/UI/DVMParametersForm.java    | 10 +--
 .../EnvironmentValuesDBTable.java             |  8 +++
 .../UI/EnvironmentsValuesForm.java            | 10 +--
 .../GlobalData/Machine/MachinesDBTable.java   |  8 +++
 .../GlobalData/Machine/UI/MachinesForm.java   | 10 +--
 .../GlobalData/Makefile/MakefilesDBTable.java |  8 +++
 .../GlobalData/Makefile/UI/MakefilesForm.java | 10 +--
 .../GlobalData/Module/ModulesDBTable.java     |  8 +++
 .../GlobalData/Module/UI/ModulesForm.java     | 10 +--
 .../RunConfigurationsDBTable.java             |  8 +++
 .../UI/RunConfigurationsForm.java             | 10 +--
 .../SapforProfile/SapforProfilesDBTable.java  |  8 +++
 .../SapforProfile/UI/SapforProfilesForm.java  | 10 +--
 .../CompilationTasksDBTable.java              |  8 +++
 .../UI/CompilationTasksForm.java              | 10 +--
 .../Tasks/RunTask/RunTasksDBTable.java        |  8 +++
 .../Tasks/RunTask/UI/RunTasksForm.java        | 10 +--
 .../GlobalData/User/UI/UsersForm.java         | 10 +--
 .../GlobalData/User/UsersDBTable.java         |  8 +++
 .../ProjectData/DBArray/ArraysDBTable.java    |  8 +++
 .../ProjectData/DBArray/UI/DBArraysForm.java  | 10 +--
 .../SapforData/Arrays/ProjectArraysSet.java   |  8 +++
 .../Arrays/UI/ProjectArraysForm.java          |  8 ---
 .../Regions/ParallelRegionsSet.java           |  8 +++
 .../Regions/UI/ParallelRegionsForm.java       |  8 ---
 .../Variants/ParallelVariantsSet.java         |  4 ++
 .../Variants/UI/ParallelVariantsForm.java     |  6 +-
 .../BugReport/BugReportsDBTable.java          |  8 +++
 .../BugReport/UI/BugReportsForm.java          | 10 +--
 .../Repository/Component/ComponentsSet.java   |  8 +++
 .../Component/UI/ComponentsForm.java          | 12 +---
 .../SubscriberWorkspaceDBTable.java           |  8 +++
 .../UI/SubscriberWorkspacesForm.java          | 10 +--
 .../Subscribes/SubsribersDBTable.java         |  8 +++
 .../Subscribes/UI/SubsribersForm.java         | 10 +--
 .../Common/Group/GroupsDBTable.java           |  8 +++
 .../Common/Group/UI/GroupsForm.java           | 10 +--
 .../Common/Test/TestDBTable.java              |  8 +++
 .../Common/Test/UI/TestsForm.java             | 10 +--
 .../DVMConfigurationDBTable.java              |  8 +++
 .../UI/DVMConfigurationsForm.java             | 10 +--
 .../DVM/DVMPackage/DVMPackageDBTable.java     |  8 +++
 .../DVM/DVMPackage/UI/DVMPackagesForm.java    | 10 +--
 .../DVM/DVMSettings/DVMSettingsDBTable.java   |  8 +++
 .../DVM/DVMSettings/UI/DVMSettingsForm.java   | 10 +--
 .../DVM/DVMTasks/DVMRunTasksSet.java          |  9 ++-
 .../DVM/DVMTasks/UI/DVMRunTasksForm.java      | 10 +--
 .../SapforConfigurationDBTable.java           |  8 +++
 .../UI/SapforConfigurationsForm.java          | 10 +--
 .../SapforPackage/SapforPackageDBTable.java   |  8 +++
 .../SapforPackage/UI/SapforPackagesForm.java  | 10 +--
 .../SapforSettings/SapforSettingsDBTable.java |  8 +++
 .../SapforSettings/UI/SapforSettingsForm.java | 10 +--
 .../SapforSettingsCommandsDBTable.java        |  8 +++
 .../UI/SapforSettingsCommandsForm.java        | 10 +--
 .../ServerSapfor/ServerSapforsDBTable.java    |  8 +++
 .../ServerSapfor/UI/ServerSapforsForm.java    | 10 +--
 63 files changed, 339 insertions(+), 278 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 54ba3519..86322a3c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,6 +9,67 @@
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/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/Compiler/UI/CompilersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/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/CompilationTask/UI/CompilationTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java
index c9c9c27e..3da53482 100644
--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -19,6 +19,13 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         k = k_in;
         d = d_in;
     }
+    //--
+    public String getPluralDescription() {
+        return "";
+    }
+    public String getSingleDescription() {
+        return "";
+    }
     //---
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return null;
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index b1b01562..b867d5d6 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -72,12 +72,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
             }
         }
     }
-    protected String getPluralDescription() {
-        return "";
-    }
-    protected String getSingleDescription() {
-        return "";
-    }
     <M> Vector<M> getFilters(Class<M> f) {
         Vector<M> res = new Vector<>();
         for (DBObjectFilter_ filter_ : allFilters) {
@@ -342,7 +336,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
             filter.Mount(getControl());
     }
     protected DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription());
+        return new DataMenuBar(dataSource.getPluralDescription());
     }
     protected void createFilters() {
     }
@@ -465,7 +459,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
     }
     public boolean CheckSelectedOrCurrent(TextLog log) {
         if ((getSelectedCount() == 0) && (CurrentName() == null || (getCurrent() == null))) {
-            log.Writeln_(getPluralDescription() + ":");
+            log.Writeln_(dataSource.getPluralDescription() + ":");
             log.Writeln_("Отсутствуют отмеченные объекты, или текущий объект!");
             return false;
         }
@@ -512,13 +506,13 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
     }
     //ДИАЛОГИ
     public boolean ShowAddObjectDialog(D object) {
-        return getDialog().ShowDialog(getSingleDescription() + ": добавление", object);
+        return getDialog().ShowDialog(dataSource.getSingleDescription() + ": добавление", object);
     }
     public boolean ShowEditObjectDialog(D object) {
         DBObjectDialog dialog = getDialog();
         dialog.edit = true;
         dialog.SetEditLimits();
-        String title = getSingleDescription() + ": ";
+        String title = dataSource.getSingleDescription() + ": ";
         if (isObjectEditable(object)) {
             title += "редактирование";
         } else {
@@ -528,9 +522,9 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
         return dialog.ShowDialog(title, object);
     }
     public boolean ShowDeleteObjectDialog(D object) {
-        return UI.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");
+        return UI.Warning(dataSource.getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");
     }
     public boolean ShowDeleteObjectsDialog(int toDeleteCount) {
-        return UI.Warning(getPluralDescription() + " в количестве " + toDeleteCount + " будут удалены)");
+        return UI.Warning(dataSource.getPluralDescription() + " в количестве " + toDeleteCount + " будут удалены)");
     }
 }
diff --git a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
index 10424a60..e1cbad67 100644
--- a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
+++ b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
@@ -19,6 +19,14 @@ public class CompilersDBTable extends iDBTable<Compiler> {
         super(Compiler.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "компилятор";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "компиляторы";
+    }
+    @Override
     public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
         LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
         res.put(Makefile.class, new FKBehaviour(FKDataBehaviour.DROP, FKCurrentObjectBehaviuor.PASSIVE));
diff --git a/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java b/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
index 13485224..e6a39520 100644
--- a/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
+++ b/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
@@ -19,14 +19,6 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
         return Current.Compiler;
     }
     @Override
-    protected String getSingleDescription() {
-        return "компилятор";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "компиляторы";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -68,7 +60,7 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.AddCompiler,
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.AddCompiler,
                 PassCode.EditCompiler,
                 PassCode.DeleteCompiler,
                 PassCode.ShowCompilerVersion,
diff --git a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
index c8a405fb..f957f324 100644
--- a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
+++ b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
@@ -11,6 +11,14 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
         super(DVMParameter.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "параметр DVM системы";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "параметры DVM";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new DVMParametersForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java b/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java
index d2f04b9a..31415116 100644
--- a/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java
+++ b/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java
@@ -18,14 +18,6 @@ public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
         return Current.DVMParameterValue;
     }
     @Override
-    protected String getSingleDescription() {
-        return "параметр DVM системы";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "параметры DVM";
-    }
-    @Override
     public String[] getUIColumnNames() {
         return new String[]{
                 "имя",
@@ -48,7 +40,7 @@ public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        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 5527fcea..108aff83 100644
--- a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
+++ b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
@@ -11,6 +11,14 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
         super(EnvironmentValue.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "переменная окружения";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "переменные окружения";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new EnvironmentsValuesForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java b/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
index 85a97341..c8a93880 100644
--- a/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
+++ b/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
@@ -19,14 +19,6 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
         return Current.EnvironmentValue;
     }
     @Override
-    protected String getSingleDescription() {
-        return "переменная окружения";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "переменные окружения";
-    }
-    @Override
     public String[] getUIColumnNames() {
         return new String[]{
                 "имя",
@@ -48,7 +40,7 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.AddEnvironmentValue,
                 PassCode.EditEnvironmentValue,
                 PassCode.DeleteEnvironmentValue,
diff --git a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
index 6bfffa3d..41da6575 100644
--- a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
@@ -25,6 +25,14 @@ public class MachinesDBTable extends iDBTable<Machine> {
         super(Machine.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "машина";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "машины";
+    }
+    @Override
     public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
         LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
         //-
diff --git a/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java b/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
index 61b8a384..9b5ed720 100644
--- a/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
+++ b/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
@@ -22,14 +22,6 @@ public class MachinesForm extends DataSetControlForm<Machine> {
         return Current.Machine;
     }
     @Override
-    protected String getSingleDescription() {
-        return "машина";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "машины";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -64,7 +56,7 @@ public class MachinesForm extends DataSetControlForm<Machine> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.AddMachine,
                 PassCode.EditMachine,
                 PassCode.DeleteMachine) {
diff --git a/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java b/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
index 575afef6..0075d8f7 100644
--- a/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
@@ -18,6 +18,14 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
         super(Makefile.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "мейкфайл";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "мейкфайлы";
+    }
+    @Override
     public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
         LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
         res.put(Module.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
diff --git a/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java b/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
index 6fa8276a..f72d9731 100644
--- a/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
+++ b/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
@@ -20,14 +20,6 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
         return Current.Makefile;
     }
     @Override
-    protected String getSingleDescription() {
-        return "мейкфайл";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "мейкфайлы";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -58,7 +50,7 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.Compile,
                 PassCode.AddMakefile,
                 PassCode.EditMakefile,
diff --git a/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java b/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
index 8af83736..5a6811ea 100644
--- a/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
@@ -9,6 +9,14 @@ public class ModulesDBTable extends iDBTable<Module> {
         super(Module.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "языковой модуль";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "языковые модули";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new ModulesForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java b/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
index 079da06b..e519d870 100644
--- a/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
+++ b/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
@@ -19,14 +19,6 @@ public class ModulesForm extends DataSetControlForm<Module> {
         return Current.Module;
     }
     @Override
-    protected String getSingleDescription() {
-        return "языковой модуль";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "языковые модули";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -60,7 +52,7 @@ public class ModulesForm extends DataSetControlForm<Module> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.EditModule);
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.EditModule);
     }
     @Override
     public boolean isObjectVisible(Module object) {
diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
index 77650e4c..40741ba1 100644
--- a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
+++ b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
@@ -19,6 +19,14 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
         super(RunConfiguration.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "конфигурация запуска";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "конфигурации запуска";
+    }
+    @Override
     public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
         LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
         res.put(RunTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java b/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
index 2702ccb2..cb66649a 100644
--- a/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
+++ b/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
@@ -18,14 +18,6 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
         return Current.RunConfiguration;
     }
     @Override
-    protected String getSingleDescription() {
-        return "конфигурация запуска";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "конфигурации запуска";
-    }
-    @Override
     public String[] getUIColumnNames() {
         return new String[]{
                 "Команда",
@@ -64,7 +56,7 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.Run,
                 PassCode.AddRunConfiguration,
                 PassCode.EditRunConfiguration,
diff --git a/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java b/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
index 6b67218e..c06b7dbc 100644
--- a/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
+++ b/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
@@ -17,6 +17,14 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
         super(SapforProfile.class);
     }
     @Override
+    public String getPluralDescription() {
+        return "профили SAPFOR";
+    }
+    @Override
+    public String getSingleDescription() {
+        return "профиль SAPFOR";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new SapforProfilesForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java b/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java
index d9975e89..492d0e96 100644
--- a/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java
+++ b/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java
@@ -19,14 +19,6 @@ public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
         return Current.SapforProfile;
     }
     @Override
-    protected String getPluralDescription() {
-        return "профили SAPFOR";
-    }
-    @Override
-    protected String getSingleDescription() {
-        return "профиль SAPFOR";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -50,7 +42,7 @@ public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.SaveProfile,
                 PassCode.EditProfile,
                 PassCode.ApplyProfile,
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
index bb597396..c1ed7148 100644
--- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
@@ -17,6 +17,14 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
         super(CompilationTask.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "задача на компиляцию";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "задачи на компиляцию";
+    }
+    @Override
     public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
         LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
         res.put(RunTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
index c3a67426..2def04ef 100644
--- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
@@ -20,14 +20,6 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
         return Current.CompilationTask;
     }
     @Override
-    protected String getSingleDescription() {
-        return "задача на компиляцию";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "задачи на компиляцию";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -65,7 +57,7 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.DeleteCompilationTasks);
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteCompilationTasks);
     }
     @Override
     public boolean isObjectVisible(CompilationTask object) {
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
index 8bd51d38..984f3929 100644
--- a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
@@ -11,6 +11,14 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
         super(RunTask.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "задача на запуск";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "задачи на запуск";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new RunTasksForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
index a2e09eed..de2b2197 100644
--- a/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
@@ -20,14 +20,6 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
         return Current.RunTask;
     }
     @Override
-    protected String getSingleDescription() {
-        return "задача на запуск";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "задачи на запуск";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -77,7 +69,7 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.DeleteRunTasks);
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteRunTasks);
     }
     @Override
     public boolean isObjectVisible(RunTask object) {
diff --git a/src/_VisualDVM/GlobalData/User/UI/UsersForm.java b/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
index e4155a4d..697ba9fc 100644
--- a/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
+++ b/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
@@ -20,14 +20,6 @@ public class UsersForm extends DataSetControlForm<User> {
         return Current.User;
     }
     @Override
-    protected String getSingleDescription() {
-        return "пользователь";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "пользователи";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -65,7 +57,7 @@ public class UsersForm extends DataSetControlForm<User> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.AddUser,
                 PassCode.EditUser,
                 PassCode.InitialiseUser,
diff --git a/src/_VisualDVM/GlobalData/User/UsersDBTable.java b/src/_VisualDVM/GlobalData/User/UsersDBTable.java
index f621df36..38fcb955 100644
--- a/src/_VisualDVM/GlobalData/User/UsersDBTable.java
+++ b/src/_VisualDVM/GlobalData/User/UsersDBTable.java
@@ -18,6 +18,14 @@ public class UsersDBTable extends iDBTable<User> {
         super(User.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "пользователь";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "пользователи";
+    }
+    @Override
     public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
         LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
         res.put(CompilationTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
diff --git a/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java b/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
index c48a2e2d..1eaff601 100644
--- a/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
+++ b/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
@@ -9,6 +9,14 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
         super(String.class, DBArray.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "массив";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "сохранённые состояния";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new DBArraysForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java b/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
index e57e1c0c..6c50e984 100644
--- a/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
+++ b/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
@@ -15,14 +15,6 @@ public class DBArraysForm extends DataSetControlForm<DBArray> {
         return Current.DBArray;
     }
     @Override
-    protected String getSingleDescription() {
-        return "массив";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "сохранённые состояния";
-    }
-    @Override
     public String[] getUIColumnNames() {
         return new String[]{"Имя"};
     }
@@ -47,7 +39,7 @@ public class DBArraysForm extends DataSetControlForm<DBArray> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription()) {
+        return new DataMenuBar(dataSource.getPluralDescription()) {
             @Override
             public void createSelectionButtons(DataSet dataSet) {
                 //не нужны.
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java
index fa5e5fa4..0bfa16a7 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java
@@ -9,6 +9,14 @@ public class ProjectArraysSet extends DataSet<Long, ProjectArray> {
         super(Long.class, ProjectArray.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "массив";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "объявленные массивы";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new ProjectArraysForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
index 3d36a832..8f60027d 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
@@ -29,14 +29,6 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
         return Current.ProjectArray;
     }
     @Override
-    protected String getSingleDescription() {
-        return "массив";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "объявленные массивы";
-    }
-    @Override
     public String[] getUIColumnNames() {
         return new String[]{
                 "Имя",
diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java b/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java
index 68829afc..0f87ba6c 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java
@@ -11,6 +11,14 @@ public class ParallelRegionsSet extends DataSet<BigInteger, ParallelRegion> {
         super(BigInteger.class, ParallelRegion.class);
     }
     @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/UI/ParallelRegionsForm.java b/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java
index 8b09ad2f..c6d9bc81 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java
@@ -16,14 +16,6 @@ public class ParallelRegionsForm extends DataSetControlForm<ParallelRegion> {
         return Current.ParallelRegionInfo;
     }
     @Override
-    protected String getSingleDescription() {
-        return "область распараллеливания";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "области распараллеливания";
-    }
-    @Override
     public String[] getUIColumnNames() {
         return new String[]{
                 "Имя",
diff --git a/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java b/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java
index 72f05605..b91f1b08 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java
@@ -9,6 +9,10 @@ public class ParallelVariantsSet extends DataSet<String, ParallelVariant> {
         super(String.class, ParallelVariant.class);
     }
     @Override
+    public String getPluralDescription() {
+        return "варианты";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new ParallelVariantsForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java b/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
index 3dfb436c..1fd02d15 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
@@ -19,10 +19,6 @@ public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
         return Current.ParallelVariant;
     }
     @Override
-    protected String getPluralDescription() {
-        return "варианты";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -84,7 +80,7 @@ public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.ShowAllParallelVariants,
                 PassCode.ShowParallelVariantsCoverage,
                 PassCode.PredictParallelVariants,
diff --git a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
index 6b14454d..96eca889 100644
--- a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
+++ b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
@@ -13,6 +13,14 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
         super(String.class, BugReport.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "отчёт об ошибке";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "отчёты об ошибках";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new BugReportsForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java b/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
index a1b4b924..1f988b2e 100644
--- a/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
+++ b/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
@@ -35,14 +35,6 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
         return Current.BugReport;
     }
     @Override
-    protected String getSingleDescription() {
-        return "отчёт об ошибке";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "отчёты об ошибках";
-    }
-    @Override
     public String[] getUIColumnNames() {
         return new String[]{
                 "Описание",
@@ -92,7 +84,7 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.SynchronizeBugReports,
                 PassCode.DownloadAllBugReportsArchives,
                 PassCode.AddBugReport,
diff --git a/src/_VisualDVM/Repository/Component/ComponentsSet.java b/src/_VisualDVM/Repository/Component/ComponentsSet.java
index 4c9d2004..db014c43 100644
--- a/src/_VisualDVM/Repository/Component/ComponentsSet.java
+++ b/src/_VisualDVM/Repository/Component/ComponentsSet.java
@@ -9,6 +9,14 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
         super(ComponentType.class, Component.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "компонент";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "компоненты";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new ComponentsForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java b/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
index 2ca7d998..fa3bd50c 100644
--- a/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
+++ b/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
@@ -23,14 +23,6 @@ public class ComponentsForm extends DataSetControlForm<Component> {
         return Current.Component;
     }
     @Override
-    protected String getSingleDescription() {
-        return "компонент";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "компоненты";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -69,7 +61,7 @@ public class ComponentsForm extends DataSetControlForm<Component> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.InstallComponentFromFolder,
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.InstallComponentFromFolder,
                 PassCode.UpdateSelectedComponents,
                 PassCode.PublishComponent,
                 PassCode.ShowComponentChangesLog) {
@@ -84,7 +76,7 @@ public class ComponentsForm extends DataSetControlForm<Component> {
                             }
                         }
                 );
-                Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
+                MainModule_.instance.getPass(PassCode.PublishComponent).setControlsVisible(false);
             }
         };
     }
diff --git a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java b/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
index 3b2baefa..60bd44cb 100644
--- a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
+++ b/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
@@ -10,6 +10,14 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
     public SubscriberWorkspaceDBTable() {
         super(SubscriberWorkspace.class);
     }
+    @Override
+    public String getSingleDescription() {
+        return "рабочая папка";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "рабочие папки";
+    }
     public SubscriberWorkspace findWorkspace(String email, String machineURL, String login) {
         return this.Data.values().stream().filter(subscriberWorkspace ->
                 subscriberWorkspace.email.equals(email) &&
diff --git a/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java b/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
index 7879ac49..dd25cc60 100644
--- a/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
+++ b/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
@@ -17,14 +17,6 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
         return Current.SubscriberWorkspace;
     }
     @Override
-    protected String getSingleDescription() {
-        return "рабочая папка";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "рабочие папки";
-    }
-    @Override
     public String[] getUIColumnNames() {
         return new String[]{
                 "URL",
@@ -45,7 +37,7 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
     }
     @Override
     public boolean isObjectVisible(SubscriberWorkspace object) {
diff --git a/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java b/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
index ef2b7cec..69dac752 100644
--- a/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
+++ b/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
@@ -17,6 +17,14 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
         super(String.class, Subscriber.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "адресат";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "адресаты";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new SubsribersForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java b/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
index 9fc18174..0734ca2c 100644
--- a/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
+++ b/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
@@ -20,14 +20,6 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
         return Current.Subscriber;
     }
     @Override
-    protected String getSingleDescription() {
-        return "адресат";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "адресаты";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -60,7 +52,7 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.SaveBugReportExecutor,
                 PassCode.SaveBugReportRecipients,
                 PassCode.AddSubscriber,
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
index 869349f6..24e13576 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
@@ -20,6 +20,14 @@ public class GroupsDBTable extends iDBTable<Group> {
     }
     //------------------------------------------------>>>
     @Override
+    public String getSingleDescription() {
+        return "группа тестов";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "группы";
+    }
+    @Override
     public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
         LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
         res.put(Test.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
index 3051018f..e8af6765 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
@@ -26,14 +26,6 @@ public class GroupsForm extends DataSetControlForm<Group> {
         return Current.Group;
     }
     @Override
-    protected String getSingleDescription() {
-        return "группа тестов";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "группы";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -63,7 +55,7 @@ public class GroupsForm extends DataSetControlForm<Group> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.SynchronizeTests,
                 PassCode.ConvertCorrectnessTests) {
             {
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java b/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
index d46ac1aa..32817b7c 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
@@ -13,6 +13,14 @@ public class TestDBTable extends iDBTable<Test> {
         super(Test.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "тест";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "тесты";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new TestsForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
index 0ba6b38a..2792c6a2 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
@@ -18,14 +18,6 @@ public class TestsForm extends DataSetControlForm<Test> {
         return Current.Test;
     }
     @Override
-    protected String getSingleDescription() {
-        return "тест";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "тесты";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -58,7 +50,7 @@ public class TestsForm extends DataSetControlForm<Test> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription()) {
+        return new DataMenuBar(dataSource.getPluralDescription()) {
             {
                 addMenus(new AddTestMenu(), new EditTestMenu());
                 addPasses(PassCode.DownloadTest, PassCode.DeleteTest);
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
index 24671cdf..884eebc9 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
@@ -11,6 +11,14 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
         super(DVMConfiguration.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "конфигурация";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "конфигурации";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new DVMConfigurationsForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
index 52eb8508..e478cb7f 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
@@ -21,14 +21,6 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
         return Current.DVMConfiguration;
     }
     @Override
-    protected String getSingleDescription() {
-        return "конфигурация";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "конфигурации";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -76,7 +68,7 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.PublishConfiguration,
                 PassCode.EditConfiguration,
                 PassCode.ShowCurrentDVMConfigurationTests,
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index 2ade2659..733ce11f 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -11,6 +11,14 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
         super(DVMPackage.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "пакет";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "пакеты";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new DVMPackagesForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
index d4660d51..d7cfb32b 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
@@ -27,14 +27,6 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
         return Current.DVMPackage;
     }
     @Override
-    protected String getSingleDescription() {
-        return "пакет";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "пакеты";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -112,7 +104,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription()) {
+        return new DataMenuBar(dataSource.getPluralDescription()) {
             {
                 addPasses(PassCode.SynchronizeTests);
                 addSeparator();
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
index 7bab9e84..43cecf56 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
@@ -11,6 +11,14 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
         super(DVMSettings.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "параметры тестирования";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "параметры тестирования";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new DVMSettingsForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
index 02422153..b86e32fc 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
@@ -18,14 +18,6 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
         return Current.DVMSettings;
     }
     @Override
-    protected String getSingleDescription() {
-        return "параметры тестирования";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "параметры тестирования";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -70,7 +62,7 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.PublishDVMSettings,
                 PassCode.CloneDVMSettings,
                 PassCode.EditDVMSettings,
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
index 8788fcdb..c17650c9 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
@@ -6,12 +6,19 @@ import _VisualDVM.TestingSystem.DVM.DVMTasks.UI.DVMRunTasksForm;
 
 import javax.swing.*;
 public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
-    //todo обобщить бы наличие фильтров для всех таблиц.
     DVMPackage target;
     public DVMRunTasksSet() {
         super(Integer.class, DVMRunTask.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "задача";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "задачи";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new DVMRunTasksForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
index 933d8b86..2d0897a0 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
@@ -23,14 +23,6 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
         return Current.DVMRunTask;
     }
     @Override
-    protected String getSingleDescription() {
-        return "задача";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "задачи";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -90,7 +82,7 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
     }
     @Override
     protected void createFilters() {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
index 4d0b49bd..d371e0b9 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
@@ -13,6 +13,14 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
         super(SapforConfiguration.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "конфигурация";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "конфигурации";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new SapforConfigurationsForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
index af8c3669..98f34ad9 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
@@ -22,14 +22,6 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
         return Current.SapforConfiguration;
     }
     @Override
-    protected String getSingleDescription() {
-        return "конфигурация";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "конфигурации";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -79,7 +71,7 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.PublishSapforConfiguration,
                 PassCode.EditSapforConfiguration,
                 PassCode.ShowCurrentSAPFORConfigurationTests,
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
index 409b8efe..fa9d312a 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
@@ -11,6 +11,14 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
         super(SapforPackage.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "пакет";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "пакеты";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new SapforPackagesForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
index b4965dd8..1fa72f95 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
@@ -27,14 +27,6 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
         return Current.SapforPackage;
     }
     @Override
-    protected String getSingleDescription() {
-        return "пакет";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "пакеты";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -92,7 +84,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.SynchronizeTests) {
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SynchronizeTests) {
             {
                 addSeparator();
                 addPasses(PassCode.AbortSapforPackage);
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
index 947d873f..d6062eaf 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
@@ -17,6 +17,14 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
         super(SapforSettings.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "параметры тестирования";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "параметры тестирования";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new SapforSettingsForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
index f6133e03..035d83dc 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
@@ -17,14 +17,6 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
         return Current.SapforSettings;
     }
     @Override
-    protected String getSingleDescription() {
-        return "параметры тестирования";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "параметры тестирования";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -51,7 +43,7 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.PublishSapforSettings,
                 PassCode.CloneSapforSettings,
                 PassCode.EditSapforSettings,
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
index 21e163f6..013d9266 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
@@ -13,6 +13,14 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
         super(SapforSettingsCommand.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "команда";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "команды";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new SapforSettingsCommandsForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
index 62fc1c7b..7e0da7e2 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
@@ -18,14 +18,6 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
         return Current.SapforSettingsCommand;
     }
     @Override
-    protected String getSingleDescription() {
-        return "команда";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "команды";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -46,7 +38,7 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.PublishSapforSettingsCommand,
                 PassCode.EditSapforSettingsCommand,
                 PassCode.DeleteSapforSettingsCommand);
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
index d3a0f102..702dee54 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
@@ -11,6 +11,14 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
         super(ServerSapfor.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "версия SAPFOR";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "версии SAPFOR";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new ServerSapforsForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
index 7880aa08..4848dab8 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
@@ -20,14 +20,6 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
         return Current.ServerSapfor;
     }
     @Override
-    protected String getSingleDescription() {
-        return "версия SAPFOR";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "версии SAPFOR";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -71,7 +63,7 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.CompileServerSapfor,
                 PassCode.ShowSapforCompilationOut,
                 PassCode.ShowSapforCompilationErr,