From 66fa638ec4da962c6e809cadbe2cdd5780081d96 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 17 Oct 2024 20:04:16 +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=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86.=20?=
 =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D1=81=D1=82=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=83=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D1=8B=D0=B9=20=D1=81=D1=82=D0=B0=D1=80=D1=8B?=
 =?UTF-8?q?=D0=B9=20=D0=BA=D0=BE=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 52 ++++++++++++++++++-
 properties                                    |  2 +-
 src/Common/Database/Tables/DataSet.java       | 12 ++---
 src/Common/Visual/ControlForm.java            | 36 ++++++-------
 src/Common/Visual/DataSetControlForm.java     | 31 ++---------
 src/Common/Visual/Trees/TreeForm.java         | 18 ++-----
 .../GlobalData/Compiler/CompilersDBTable.java |  5 +-
 .../CompilerEnvironmentsSet.java              |  6 ++-
 .../CompilerOption/CompilerOptionsSet.java    |  6 ++-
 .../DVMParameter/DVMParameterDBTable.java     |  6 ++-
 .../EnvironmentValuesDBTable.java             |  6 ++-
 .../FileObject/DirInfosDataSet.java           |  6 ++-
 .../GlobalData/Machine/MachinesDBTable.java   |  5 +-
 .../GlobalData/Makefile/MakefilesDBTable.java |  5 +-
 .../GlobalData/Module/ModulesDBTable.java     |  6 ++-
 .../UI/RemoteFileChooserFields.form           |  3 +-
 .../UI/RemoteFileChooserFields.java           |  3 +-
 .../RunConfigurationsDBTable.java             |  4 +-
 .../SapforProfile/SapforProfilesDBTable.java  |  5 +-
 .../SapforProfileSettingsDBTable.java         |  6 ++-
 .../CompilationTasksDBTable.java              |  5 +-
 .../Tasks/RunTask/RunTasksDBTable.java        |  6 ++-
 .../GlobalData/User/UsersDBTable.java         |  5 +-
 .../ProjectData/DBArray/ArraysDBTable.java    |  6 ++-
 .../ProjectData/Messages/MessagesDBTable.java |  9 ++--
 .../RecommendationsDBTable.java               |  6 ++-
 .../SapforData/Arrays/ArraysSet.java          |  5 +-
 .../Arrays/UI/DimensionsTableForm.java        | 18 ++-----
 .../UI/Graph/FunctionsGraphForm.java          | 20 ++-----
 .../SapforData/Regions/RegionsSet.java        |  5 +-
 .../SapforData/Variants/VariantsSet.java      |  6 ++-
 .../BugReport/BugReportsDBTable.java          |  8 +--
 .../Repository/Component/ComponentsSet.java   |  5 +-
 .../SubscriberWorkspaceDBTable.java           |  6 ++-
 .../Subscribes/SubsribersDBTable.java         |  5 +-
 .../Common/Group/GroupsDBTable.java           |  4 +-
 .../Common/Test/TestDBTable.java              |  5 +-
 .../DVMConfigurationDBTable.java              |  6 ++-
 .../DVM/DVMPackage/DVMPackageDBTable.java     |  4 +-
 .../DVM/DVMSettings/DVMSettingsDBTable.java   |  6 ++-
 .../DVM/DVMTasks/DVMRunTasksSet.java          |  5 +-
 .../SapforConfigurationDBTable.java           |  5 +-
 .../SapforPackage/SapforPackageDBTable.java   |  4 +-
 .../SapforSettings/SapforSettingsDBTable.java |  5 +-
 .../SapforSettingsCommandsDBTable.java        |  5 +-
 .../ServerSapfor/ServerSapforsDBTable.java    |  5 +-
 src/_VisualDVM/Visual/Windows/FileForm.form   |  9 ++--
 src/_VisualDVM/Visual/Windows/FileForm.java   | 13 +++--
 .../Visual/Windows/FunctionsForm.form         |  2 +-
 .../Visual/Windows/FunctionsForm.java         |  2 +-
 .../Visual/Windows/ProjectForm.java           | 16 +++---
 .../Visual/Windows/VariantsForm.form          |  5 +-
 .../Visual/Windows/VariantsForm.java          |  7 +--
 .../Visual/Windows/VersionsForm.form          |  2 +-
 .../Visual/Windows/VersionsForm.java          |  5 +-
 55 files changed, 241 insertions(+), 212 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4a256be8..68f6488b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,8 +9,58 @@
     <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/ControlWithCurrentForm.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/ControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/ControlForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeForm.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/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/RemoteFile/UI/RemoteFileChooserFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/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/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/MessagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.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/SapforData/Arrays/ArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FunctionsForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FunctionsForm.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FunctionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FunctionsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VariantsForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VariantsForm.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VariantsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index e05c3698..3b795484 100644
--- a/properties
+++ b/properties
@@ -10,7 +10,7 @@
   "SMTPHost": "smtp.mail.ru",
   "SMTPPort": 465,
   "MailSocketPort": 465,
-  "collapseCredentials": true,
+  "collapseCredentials": false,
   "collapseFileGraphs": false,
   "collapseFileMessages": false,
   "collapseProjectTrees": false,
diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java
index a38848be..e8cd4865 100644
--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -48,11 +48,10 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
     public DataMenuBar createMenuBar() {
         return new DataMenuBar(getPluralDescription());
     }
-    public void mountUI(JPanel content_in) {
-        UI.Clear(content_in);
+    public void mountUI(JPanel mountPanel_in) {
+        UI.Clear(mountPanel_in);
         //-->
-        ui_ = createUI();
-        ui_.setContent(content_in);
+        ui_ = createUI(mountPanel_in);
         //-->
         if (hasMenuBar()) {
             try {
@@ -65,7 +64,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
                 } else {
                     bar = MainModule_.instance.getUI().menuBars.get(getClass());
                 }
-                content_in.add(bar, BorderLayout.NORTH);
+                mountPanel_in.add(bar, BorderLayout.NORTH);
                 //--
                 setFilterUI(count -> MainModule_.instance.getUI().menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
                 //--
@@ -73,7 +72,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
                 ex.printStackTrace();
             }
         }
-        content_in.add(ui_.getDataPanel(), BorderLayout.CENTER);
         //----
         createFilters();
         if (!filters.isEmpty()) {
@@ -112,7 +110,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
     public String[] getUIColumnNames() {
         return new String[]{};
     }
-    protected DataSetControlForm createUI() {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
         return null;
     }
     public boolean hasUI() {
diff --git a/src/Common/Visual/ControlForm.java b/src/Common/Visual/ControlForm.java
index 3facff37..c9a0d6e3 100644
--- a/src/Common/Visual/ControlForm.java
+++ b/src/Common/Visual/ControlForm.java
@@ -5,31 +5,30 @@ import javax.swing.*;
 import java.awt.*;
 //класс, представляющий собой прокручиваемую панель, на которой лежит нечто.
 public class ControlForm<C extends Component> {
+    JPanel mountPanel = null;  //панель на которую монтируется UI.помимо контрола может содержать меню сверху.
+    JPanel scrollPanel = null;   //панель на которой лежит скролл.
+    JScrollPane scroll = null;  //панель прокрутки в которую встроен контрол
     public C control = null;
-    public JScrollPane scroll = null;
-    protected Class<C> control_class;
-    protected JPanel content;  //задник.
-    public ControlForm(Class<C> class_in) {
+    protected Class<C> control_class = null;
+    public ControlForm(Class<C> class_in, JPanel mountPanel_in) {
         control_class = class_in;
-        setContent(new JPanel(new BorderLayout()));
+        mountPanel = mountPanel_in;
+        mountPanel.add((scrollPanel = new JPanel(new BorderLayout())), BorderLayout.CENTER);
     }
-    //нужно будет вывестии сделать нормальные формы для деревьев а не ручное создание.
-    public JPanel getContent() {
-        return content;
-    }
-    public void setContent(JPanel content_in) {
-        content = content_in;
-    }
-    //-
+    public JPanel getMountPanel(){return mountPanel;} //todo осталось только в projectForm, вывести
+    //новое отображение предполагает полную перерисовку контрола.(?)
     public void Show() {
         Clear();
-        CreateControl();
-        //------------------------
+        createControl();
+        //--
         scroll = new JScrollPane(control);
         scroll.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
         scroll.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        //--
+        scrollPanel.add(scroll);
+        scrollPanel.updateUI();
     }
-    public void CreateControl() {
+    protected void createControl() {
         try {
             control = control_class.newInstance();
         } catch (Exception e) {
@@ -40,13 +39,14 @@ public class ControlForm<C extends Component> {
         return control != null;
     }
     public void Clear() {
+        UI.Clear(scrollPanel);
         control = null; //очищено.
     }
     public void Refresh() {
         if (control != null)
-            refresh();
+            redrawControl();
     }
     //-
-    protected void refresh() {
+    protected void redrawControl() {
     } //перерисовать контрол.
 }
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index 8ef5d01a..81ebb209 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -1,6 +1,5 @@
 package Common.Visual;
 import Common.CommonConstants;
-import Common.Current_;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.Grid.TableVisualData;
 import Common.Database.Tables.DBTable;
@@ -27,35 +26,15 @@ import java.util.Vector;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 public class DataSetControlForm extends ControlForm<DataTable> {
-    protected JPanel dataPanel;
+
     protected DataSet dataSource;
     protected int current_row_i;
     protected boolean events_on = true;
     protected String colNamesAndSizes = "";
     protected Vector<ColumnInfo> columns = new Vector<>();
-    public DataSetControlForm(DataSet dataSource_in) {
-        this(dataSource_in, DataTable.class);
-    }
-    public DataSetControlForm(DataSet dataSource_in, Class tableClass) {
-        super(tableClass);
+    public DataSetControlForm(DataSet dataSource_in, JPanel mountPanel_in) {
+        super(DataTable.class, mountPanel_in);
         dataSource = dataSource_in;
-        //---
-        dataPanel = new JPanel(new BorderLayout());
-        content.add(dataPanel, BorderLayout.CENTER);
-    }
-    public JPanel getDataPanel() {
-        return dataPanel;
-    }
-    @Override
-    public void Show() {
-        super.Show();
-        dataPanel.add(scroll);
-        dataPanel.updateUI();
-    }
-    @Override
-    public void Clear() {
-        super.Clear();
-        UI.Clear(dataPanel);
     }
     public void SaveColumns() {
         if (MainModule_.instance.getDb() != null) {
@@ -101,7 +80,7 @@ public class DataSetControlForm extends ControlForm<DataTable> {
     }
     @SuppressWarnings("unchecked")
     @Override
-    public void CreateControl() {
+    protected void createControl() {
         CreateColumnsInfo();
         GridAnchestor table_data_model = new GridAnchestor(getHeaders(), dataSource.getVisibleKeys()) {
             @SuppressWarnings("unchecked")
@@ -276,7 +255,7 @@ public class DataSetControlForm extends ControlForm<DataTable> {
         }
     }
     @Override
-    protected void refresh() {
+    protected void redrawControl() {
         control.CorrectSizes();
     }
     public void Show(Object pk) {
diff --git a/src/Common/Visual/Trees/TreeForm.java b/src/Common/Visual/Trees/TreeForm.java
index 674e9cf9..b0430652 100644
--- a/src/Common/Visual/Trees/TreeForm.java
+++ b/src/Common/Visual/Trees/TreeForm.java
@@ -2,29 +2,19 @@ package Common.Visual.Trees;
 import Common.Visual.ControlForm;
 import Common.Visual.UI;
 
+import javax.swing.*;
 import java.awt.*;
 public class TreeForm<C extends StyledTree> extends ControlForm<C> {
-    public TreeForm(Class<C> class_in) {
-        super(class_in);
+    public TreeForm(Class<C> class_in, JPanel mountPanel_in) {
+        super(class_in, mountPanel_in);
     }
     //временно, чтобы не затрагивать коды раньше времени.
     public StyledTree getTree() {
         return control;
     }
     @Override
-    protected void refresh() {
+    protected void redrawControl() {
         getTree().revalidate();
         getTree().repaint();
     }
-    @Override
-    public void Show() {
-        super.Show();
-        content.add(scroll, BorderLayout.CENTER);
-        content.updateUI();
-    }
-    @Override
-    public void Clear() {
-        super.Clear();
-        UI.Clear(content);
-    }
 }
diff --git a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
index 292a50c5..3851b58e 100644
--- a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
+++ b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
@@ -20,6 +20,7 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Utils;
 import _VisualDVM.Validators.PathValidator;
 
+import javax.swing.*;
 import java.util.LinkedHashMap;
 public class CompilersDBTable extends iDBTable<Compiler> {
     public CompilersDBTable() {
@@ -119,8 +120,8 @@ public class CompilersDBTable extends iDBTable<Compiler> {
         };
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
diff --git a/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java b/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java
index 58ec4f9e..d73f3251 100644
--- a/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java
+++ b/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java
@@ -4,6 +4,8 @@ import Common.Visual.DataSetControlForm;
 import Common.Visual.Tables.RendererMultiline;
 import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
 import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer;
+
+import javax.swing.*;
 public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment> {
     public CompilerEnvironmentsSet() {
         super(String.class, CompilerEnvironment.class);
@@ -26,8 +28,8 @@ public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment
         }
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java b/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java
index 8fe57d5c..1929ccea 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java
@@ -4,6 +4,8 @@ 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 CompilerOptionsSet extends DataSet<String, CompilerOption> {
     public CompilerOptionsSet() {
         super(String.class, CompilerOption.class);
@@ -28,8 +30,8 @@ public class CompilerOptionsSet extends DataSet<String, CompilerOption> {
         }
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
index 37c3b571..4b0534f5 100644
--- a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
+++ b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
@@ -11,6 +11,8 @@ import _VisualDVM.Global;
 import _VisualDVM.GlobalData.DVMParameter.UI.DVMParameterFields;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Utils;
+
+import javax.swing.*;
 public class DVMParameterDBTable extends iDBTable<DVMParameter> {
     public DVMParameterDBTable() {
         super(DVMParameter.class);
@@ -42,8 +44,8 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
         return Current.DVMParameterValue;
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
index 2f039ead..ad0c3f6d 100644
--- a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
+++ b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
@@ -11,6 +11,8 @@ import _VisualDVM.Global;
 import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Utils;
+
+import javax.swing.*;
 public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
     public EnvironmentValuesDBTable() {
         super(EnvironmentValue.class);
@@ -67,8 +69,8 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
         };
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
diff --git a/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java b/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java
index 22ddda18..6e77ca79 100644
--- a/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java
+++ b/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java
@@ -2,13 +2,15 @@ package _VisualDVM.GlobalData.FileObject;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Tables.RendererDate;
+
+import javax.swing.*;
 public class DirInfosDataSet extends DataSet<String, DirInfo> {
     public DirInfosDataSet() {
         super(String.class, DirInfo.class);
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @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 e27a50c1..6ab4d557 100644
--- a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
@@ -24,6 +24,7 @@ import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 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;
@@ -88,8 +89,8 @@ public class MachinesDBTable extends iDBTable<Machine> {
         return res;
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
diff --git a/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java b/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
index 8eae6a8a..f121cdab 100644
--- a/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
@@ -15,6 +15,7 @@ import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
 import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
 import _VisualDVM.Passes.PassCode;
 
+import javax.swing.*;
 import java.util.LinkedHashMap;
 public class MakefilesDBTable extends iDBTable<Makefile> {
     public MakefilesDBTable() {
@@ -40,8 +41,8 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
         return res;
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
diff --git a/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java b/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
index 0dbcda76..ff0c7661 100644
--- a/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
@@ -7,6 +7,8 @@ import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
 import _VisualDVM.Passes.PassCode;
+
+import javax.swing.*;
 public class ModulesDBTable extends iDBTable<Module> {
     public ModulesDBTable() {
         super(Module.class);
@@ -24,8 +26,8 @@ public class ModulesDBTable extends iDBTable<Module> {
         return new ModuleAnchestorForm<>();
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.form b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.form
index 3aa52dee..cf36d1f0 100644
--- a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.form
+++ b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.form
@@ -37,8 +37,7 @@
           </component>
         </children>
       </toolbar>
-      <grid id="a6308" binding="TreePanel" custom-create="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
+      <grid id="a6308" binding="TreePanel" layout-manager="BorderLayout" hgap="0" vgap="0">
         <constraints>
           <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
diff --git a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
index 0c823ee8..905b6ca2 100644
--- a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
+++ b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
@@ -16,6 +16,7 @@ public class RemoteFileChooserFields implements DialogFields {
     private JButton bBack;
     private JButton bHome;
     public RemoteFileChooserFields() {
+        treeForm = new TreeForm(RemoteFilesTree.class,TreePanel);
         bBack.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -31,7 +32,7 @@ public class RemoteFileChooserFields implements DialogFields {
     }
     private void createUIComponents() {
         // TODO: place custom component creation code here
-        TreePanel = (treeForm = new TreeForm(RemoteFilesTree.class)).getContent();
+
     }
     @Override
     public Component getContent() {
diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
index 71910fc7..202efff7 100644
--- a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
+++ b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
@@ -118,8 +118,8 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
         return res;
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
diff --git a/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java b/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
index 6cd479df..b438371b 100644
--- a/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
+++ b/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
@@ -13,6 +13,7 @@ import _VisualDVM.GlobalData.SapforProfile.UI.SapforProfileFields;
 import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
 import _VisualDVM.Passes.PassCode;
 
+import javax.swing.*;
 import java.util.Date;
 import java.util.LinkedHashMap;
 public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
@@ -28,8 +29,8 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
         return "профиль SAPFOR";
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java b/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java
index a6ef2609..213d2598 100644
--- a/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java
+++ b/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java
@@ -2,6 +2,8 @@ package _VisualDVM.GlobalData.SapforProfileSetting;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
 import _VisualDVM.Current;
+
+import javax.swing.*;
 public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting> {
     public SapforProfileSettingsDBTable() {
         super(SapforProfileSetting.class);
@@ -11,8 +13,8 @@ public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting>
         return false;
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
index 28484c89..259cd139 100644
--- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
@@ -14,6 +14,7 @@ import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 import _VisualDVM.Passes.PassCode;
 
+import javax.swing.*;
 import java.util.LinkedHashMap;
 public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
     public CompilationTasksDBTable() {
@@ -34,8 +35,8 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
         return res;
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
index e189b87e..3532a83c 100644
--- a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
@@ -8,6 +8,8 @@ import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
+
+import javax.swing.*;
 public class RunTasksDBTable extends iDBTable<RunTask> {
     public RunTasksDBTable() {
         super(RunTask.class);
@@ -21,8 +23,8 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
         return "задачи на запуск";
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/GlobalData/User/UsersDBTable.java b/src/_VisualDVM/GlobalData/User/UsersDBTable.java
index 0d94f13d..148e52ea 100644
--- a/src/_VisualDVM/GlobalData/User/UsersDBTable.java
+++ b/src/_VisualDVM/GlobalData/User/UsersDBTable.java
@@ -17,6 +17,7 @@ import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 import _VisualDVM.GlobalData.User.UI.UserFields;
 import _VisualDVM.Passes.PassCode;
 
+import javax.swing.*;
 import java.util.LinkedHashMap;
 public class UsersDBTable extends iDBTable<User> {
     public UsersDBTable() {
@@ -73,8 +74,8 @@ public class UsersDBTable extends iDBTable<User> {
         };
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
diff --git a/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java b/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
index 6fdca028..1684e48a 100644
--- a/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
+++ b/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
@@ -4,6 +4,8 @@ import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import _VisualDVM.Current;
+
+import javax.swing.*;
 public class ArraysDBTable extends DBTable<String, DBArray> {
     public ArraysDBTable() {
         super(String.class, DBArray.class);
@@ -17,8 +19,8 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
         return "сохранённые состояния";
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java b/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
index d4997bb8..2b79b555 100644
--- a/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
+++ b/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
@@ -6,6 +6,7 @@ import Common.Visual.Tables.ColumnFilter;
 import Common.Visual.Tables.RendererWrapText;
 import _VisualDVM.Global;
 
+import javax.swing.*;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
 import java.util.Comparator;
@@ -17,9 +18,9 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
         super(d_in);
     }
     @Override
-    protected DataSetControlForm createUI() {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
         DataSet dataset = this;
-        return new DataSetControlForm(this) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
@@ -36,8 +37,8 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
                 ShowCurrentObject();
             }
             @Override
-            public void CreateControl() {
-                super.CreateControl();
+            protected void createControl() {
+                super.createControl();
                 columnsFilters.put(3, new ColumnFilter(dataset, 3));
                 control.setRowSorter(null);
                 TableRowSorter<TableModel> sorter = new TableRowSorter<>(control.getModel());
diff --git a/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java b/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
index 746cfbcd..3f8563b2 100644
--- a/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
+++ b/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
@@ -5,6 +5,8 @@ import Common.Visual.Tables.RendererWrapText;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.Passes.PassCode;
+
+import javax.swing.*;
 public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
     //group=1 - настройка
     //group=2 - преобразование
@@ -13,8 +15,8 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
         //   setUIContent(UI.getMainWindow().errorsPanel);
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
index 98ab4b23..1ffc5a98 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
@@ -9,6 +9,7 @@ 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() {
@@ -27,8 +28,8 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
         return Current.ProjectArray;
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
index 64177206..ad3fad42 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
@@ -8,25 +8,15 @@ import _VisualDVM.Global;
 import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
 import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
 
+import javax.swing.*;
 import java.awt.*;
 import java.util.Vector;
 public class DimensionsTableForm extends ControlForm<StyledTable> {
-    public DimensionsTableForm() {
-        super(StyledTable.class);
+    public DimensionsTableForm(JPanel mountPanel_in) {
+        super(StyledTable.class,mountPanel_in);
     }
     @Override
-    public void Show() {
-        super.Show();
-        content.add(scroll, BorderLayout.CENTER);
-        content.updateUI();
-    }
-    @Override
-    public void Clear() {
-        super.Clear();
-        UI.Clear(content);
-    }
-    @Override
-    public void CreateControl() {
+    protected void createControl() {
         Vector<String> columns = new Vector<>();
         columns.add("шаблон");
         for (int i = 0; i < Global.mainModule.getProject().maxdim; ++i)
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
index aaddf241..081380ac 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
@@ -1,27 +1,15 @@
 package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
 import Common.Visual.ControlForm;
-import Common.Visual.UI;
 import _VisualDVM.Global;
 import com.mxgraph.swing.mxGraphComponent;
 
-import java.awt.*;
+import javax.swing.*;
 public class FunctionsGraphForm extends ControlForm<mxGraphComponent> {
-    public FunctionsGraphForm() {
-        super(mxGraphComponent.class);
+    public FunctionsGraphForm(JPanel mountPanel_in) {
+        super(mxGraphComponent.class, mountPanel_in);
     }
     @Override
-    public void CreateControl() {
+    protected void createControl() {
         control = Global.mainModule.getProject().DrawFunctionsGraph();
     }
-    @Override
-    public void Show() {
-        super.Show();
-        content.add(scroll, BorderLayout.CENTER);
-        content.updateUI();
-    }
-    @Override
-    public void Clear() {
-        super.Clear();
-        UI.Clear(content);
-    }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java b/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
index c80f7a04..a4a87016 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
@@ -5,6 +5,7 @@ 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> {
     //суррогат. нужен только для сохры столбцов. во всяком случае пока.
@@ -24,8 +25,8 @@ public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
         return "области распараллеливания";
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
diff --git a/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java b/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java
index eb62d165..dad2ce85 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java
@@ -8,6 +8,8 @@ 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);
@@ -17,8 +19,8 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
         return "варианты";
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
index 3eb82cf3..7438b9a9 100644
--- a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
+++ b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
@@ -29,8 +29,8 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
         return "отчёты об ошибках";
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
@@ -54,9 +54,9 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
                 Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
             }
             @Override
-            public void CreateControl() {
+            protected void createControl() {
                 //https://stackoverflow.com/questions/9091208/jtable-enter-key
-                super.CreateControl();
+                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);
diff --git a/src/_VisualDVM/Repository/Component/ComponentsSet.java b/src/_VisualDVM/Repository/Component/ComponentsSet.java
index 061c7c8b..a51baa84 100644
--- a/src/_VisualDVM/Repository/Component/ComponentsSet.java
+++ b/src/_VisualDVM/Repository/Component/ComponentsSet.java
@@ -11,6 +11,7 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 
+import javax.swing.*;
 import java.util.Vector;
 public class ComponentsSet extends DataSet<ComponentType, Component> {
     public ComponentsSet() {
@@ -25,8 +26,8 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
         return "компоненты";
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java b/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
index a9835c1c..5ef76d7a 100644
--- a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
+++ b/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
@@ -5,6 +5,8 @@ import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import _VisualDVM.Current;
 import _VisualDVM.Passes.PassCode;
+
+import javax.swing.*;
 public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
     public SubscriberWorkspaceDBTable() {
         super(SubscriberWorkspace.class);
@@ -34,8 +36,8 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
         return new String[]{"URL", "пользователь", "папка"};
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this);
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel);
     }
     @Override
     public Object getFieldAt(SubscriberWorkspace object, int columnIndex) {
diff --git a/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java b/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
index fa68376b..05d6d972 100644
--- a/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
+++ b/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
@@ -16,6 +16,7 @@ import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
 import _VisualDVM.Repository.Subscribes.UI.SubscriberFields;
 import _VisualDVM.Repository.Subscribes.UI.SubscriberForm;
 
+import javax.swing.*;
 import java.util.LinkedHashMap;
 public class SubsribersDBTable extends DBTable<String, Subscriber> {
     public SubsribersDBTable() {
@@ -30,8 +31,8 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
         return "адресаты";
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
index 3fcc40dc..e39d1b91 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
@@ -75,8 +75,8 @@ public class GroupsDBTable extends iDBTable<Group> {
         return res;
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java b/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
index e859854f..9279eb6f 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
@@ -12,6 +12,7 @@ import _VisualDVM.TestingSystem.Common.Test.UI.AddTestMenu;
 import _VisualDVM.TestingSystem.Common.Test.UI.EditTestMenu;
 import _VisualDVM.TestingSystem.Common.Test.UI.TestFields;
 
+import javax.swing.*;
 import java.util.Vector;
 public class TestDBTable extends iDBTable<Test> {
     public TestDBTable() {
@@ -26,8 +27,8 @@ public class TestDBTable extends iDBTable<Test> {
         return "тесты";
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 //columns.get(0).setVisible(false);
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
index 63cf389f..8b15c47e 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
@@ -12,6 +12,8 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields;
+
+import javax.swing.*;
 public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
     public DVMConfigurationDBTable() {
         super(DVMConfiguration.class);
@@ -29,8 +31,8 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
         return "конфигурации";
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index bdf8d16d..8fc4e0bb 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -37,8 +37,8 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
         return "пакеты";
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
index 4ff1f94f..95dc8487 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
@@ -9,6 +9,8 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields;
+
+import javax.swing.*;
 public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
     public DVMSettingsDBTable() {
         super(DVMSettings.class);
@@ -68,8 +70,8 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
     }
     //-
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
index 98d98b6e..03283966 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
@@ -11,6 +11,7 @@ import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 
+import javax.swing.*;
 import java.util.Comparator;
 public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
     //todo обобщить бы наличие фильтров для всех таблиц.
@@ -60,8 +61,8 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
         return "задачи";
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
index 20a819a1..14ffbb38 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
@@ -14,6 +14,7 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfiguratio
 import _VisualDVM.Visual.Tables.RendererConfigurationAuto;
 import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto;
 
+import javax.swing.*;
 import java.util.Vector;
 public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
     public SapforConfigurationDBTable() {
@@ -32,8 +33,8 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
         return "конфигурации";
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
index 813021e2..f6a8e6e4 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
@@ -37,8 +37,8 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
         return "пакеты";
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
index 4b844643..e36e9e5b 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
@@ -14,6 +14,7 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsFields;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
 
+import javax.swing.*;
 import java.util.LinkedHashMap;
 public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
     public SapforSettingsDBTable() {
@@ -32,8 +33,8 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
         return "параметры тестирования";
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
index 560274ef..babdcae0 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
@@ -11,6 +11,7 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsCommandFields;
 
+import javax.swing.*;
 import java.util.Vector;
 public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsCommand> {
     public SapforSettingsCommandsDBTable() {
@@ -44,8 +45,8 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
         return Current.SapforSettingsCommand;
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
index e092e8c8..e15e011a 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
@@ -9,6 +9,7 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 
+import javax.swing.*;
 import java.util.Comparator;
 public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
     public ServerSapforsDBTable() {
@@ -45,8 +46,8 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
         return null;
     }
     @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
+        return new DataSetControlForm(this,mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 // columns.get(0).setVisible(false);
diff --git a/src/_VisualDVM/Visual/Windows/FileForm.form b/src/_VisualDVM/Visual/Windows/FileForm.form
index 53142c89..bf031f71 100644
--- a/src/_VisualDVM/Visual/Windows/FileForm.form
+++ b/src/_VisualDVM/Visual/Windows/FileForm.form
@@ -230,8 +230,7 @@
                             <properties/>
                             <border type="none"/>
                             <children>
-                              <grid id="f6da5" binding="loopsGraphPanel" custom-create="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-                                <margin top="0" left="0" bottom="0" right="0"/>
+                              <grid id="f6da5" binding="loopsGraphPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                                 <constraints>
                                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                                 </constraints>
@@ -251,8 +250,7 @@
                             <properties/>
                             <border type="none"/>
                             <children>
-                              <grid id="f80d0" binding="functionsGraphPanel" custom-create="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-                                <margin top="0" left="0" bottom="0" right="0"/>
+                              <grid id="f80d0" binding="functionsGraphPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                                 <constraints>
                                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                                 </constraints>
@@ -272,8 +270,7 @@
                             <properties/>
                             <border type="none"/>
                             <children>
-                              <grid id="1d5e4" binding="arraysGraphPanel" custom-create="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-                                <margin top="0" left="0" bottom="0" right="0"/>
+                              <grid id="1d5e4" binding="arraysGraphPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                                 <constraints>
                                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                                 </constraints>
diff --git a/src/_VisualDVM/Visual/Windows/FileForm.java b/src/_VisualDVM/Visual/Windows/FileForm.java
index 581e3c08..b55c7cda 100644
--- a/src/_VisualDVM/Visual/Windows/FileForm.java
+++ b/src/_VisualDVM/Visual/Windows/FileForm.java
@@ -76,6 +76,11 @@ public class FileForm implements FileWindow, FormWithSplitters {
         MessageNote.filterValue = "";
         //-
         file = file_in;
+        //--
+        loopsForm = new TreeForm(FileLoopsTree.class, loopsGraphPanel);
+        functionsForm = new TreeForm(FileFunctionsTree.class, functionsGraphPanel);
+        arraysForm = new TreeForm(FileArraysTree.class, arraysGraphPanel);
+        //--
         file.father.db.notes.mountUI(notesPanel);
         file.father.db.warnings.mountUI(warningsPanel);
         file.father.db.errors.mountUI(errorsPanel);
@@ -332,7 +337,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
     }
     @Override
     public void ShowFirstError() {
-        if (file.father.db.errors.ui_.control.getRowCount() > 0)
+        if (file.father.db.errors.ui_.getRowCount() > 0)
             file.father.db.errors.ui_.control.SelectRow(0);
     }
     @Override
@@ -351,12 +356,6 @@ public class FileForm implements FileWindow, FormWithSplitters {
     public void ShowNoRunOutput() {
         runOutput.setText("");
     }
-    private void createUIComponents() {
-        // TODO: place custom component creation code here
-        loopsGraphPanel = (loopsForm = new TreeForm(FileLoopsTree.class)).getContent();
-        functionsGraphPanel = (functionsForm = new TreeForm(FileFunctionsTree.class)).getContent();
-        arraysGraphPanel = (arraysForm = new TreeForm(FileArraysTree.class)).getContent();
-    }
     @Override
     public JPanel getContent() {
         return content;
diff --git a/src/_VisualDVM/Visual/Windows/FunctionsForm.form b/src/_VisualDVM/Visual/Windows/FunctionsForm.form
index 944879a4..7f0f2c56 100644
--- a/src/_VisualDVM/Visual/Windows/FunctionsForm.form
+++ b/src/_VisualDVM/Visual/Windows/FunctionsForm.form
@@ -258,7 +258,7 @@
               </component>
             </children>
           </toolbar>
-          <grid id="9d9dc" binding="functionsGraphPanel" custom-create="true" layout-manager="BorderLayout" hgap="0" vgap="0">
+          <grid id="9d9dc" binding="functionsGraphPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
             <constraints border-constraint="Center"/>
             <properties>
               <background color="-4144960"/>
diff --git a/src/_VisualDVM/Visual/Windows/FunctionsForm.java b/src/_VisualDVM/Visual/Windows/FunctionsForm.java
index 684b1af4..a81fc7bf 100644
--- a/src/_VisualDVM/Visual/Windows/FunctionsForm.java
+++ b/src/_VisualDVM/Visual/Windows/FunctionsForm.java
@@ -42,6 +42,7 @@ public class FunctionsForm implements FunctionsWindow {
     private FunctionsGraphForm functionsGraphForm;
     public FunctionsForm() {
         LoadSplitters();
+        functionsGraphForm = new FunctionsGraphForm(functionsGraphPanel);
         bZoomIn.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -188,7 +189,6 @@ public class FunctionsForm implements FunctionsWindow {
     }
     private void createUIComponents() {
         // TODO: place custom component creation code here
-        functionsGraphPanel = (functionsGraphForm = new FunctionsGraphForm()).getContent();
         filterName = new StyledTextField();
     }
 }
diff --git a/src/_VisualDVM/Visual/Windows/ProjectForm.java b/src/_VisualDVM/Visual/Windows/ProjectForm.java
index 04ceacbb..50f2078d 100644
--- a/src/_VisualDVM/Visual/Windows/ProjectForm.java
+++ b/src/_VisualDVM/Visual/Windows/ProjectForm.java
@@ -102,13 +102,13 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
     }
     private void createUIComponents() {
         // TODO: place custom component creation code here
-        filesForm = new TreeForm(FilesTree.class);
+        filesForm = new TreeForm(FilesTree.class, new JPanel(new BorderLayout()));
         projectDescription = new Viewer();
         logText = new Viewer();
         logScroll = new JScrollPane(logText);
-        includesForm = new TreeForm(IncludesTree.class);
-        inlineForm = new TreeForm(InlineTree.class);
-        inlineForm2 = new TreeForm(InlineTree2.class);
+        includesForm = new TreeForm(IncludesTree.class, new JPanel(new BorderLayout()));
+        inlineForm = new TreeForm(InlineTree.class, new JPanel(new BorderLayout()));
+        inlineForm2 = new TreeForm(InlineTree2.class, new JPanel(new BorderLayout()));
     }
     @Override
     public void RefreshProjectFiles() {
@@ -262,16 +262,16 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
         menuBar.getProjectViewMenu().setIcon(Utils_.getIcon(view.getIcon()));
         switch (view) {
             case Files:
-                projectViewPanel.add(filesForm.getContent());
+                projectViewPanel.add(filesForm.getMountPanel());
                 break;
             case Includes:
-                projectViewPanel.add(includesForm.getContent());
+                projectViewPanel.add(includesForm.getMountPanel());
                 break;
             case FunctionsHierarchy:
-                projectViewPanel.add(inlineForm2.getContent());
+                projectViewPanel.add(inlineForm2.getMountPanel());
                 break;
             case FunctionsCallsPoints:
-                projectViewPanel.add(inlineForm.getContent());
+                projectViewPanel.add(inlineForm.getMountPanel());
                 break;
         }
         projectViewPanel.revalidate();
diff --git a/src/_VisualDVM/Visual/Windows/VariantsForm.form b/src/_VisualDVM/Visual/Windows/VariantsForm.form
index 1f172805..dc7cc3be 100644
--- a/src/_VisualDVM/Visual/Windows/VariantsForm.form
+++ b/src/_VisualDVM/Visual/Windows/VariantsForm.form
@@ -139,7 +139,7 @@
                           </component>
                         </children>
                       </toolbar>
-                      <grid id="c476f" binding="dimensionsPanel" custom-create="true" layout-manager="BorderLayout" hgap="0" vgap="0">
+                      <grid id="c476f" binding="dimensionsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                         <constraints border-constraint="Center"/>
                         <properties/>
                         <border type="none"/>
@@ -159,8 +159,7 @@
                     </properties>
                     <border type="none"/>
                     <children>
-                      <grid id="d862" binding="distributionPanel" custom-create="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-                        <margin top="0" left="0" bottom="0" right="0"/>
+                      <grid id="d862" binding="distributionPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                         <constraints>
                           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                         </constraints>
diff --git a/src/_VisualDVM/Visual/Windows/VariantsForm.java b/src/_VisualDVM/Visual/Windows/VariantsForm.java
index 8fd0ec30..ff3f83f8 100644
--- a/src/_VisualDVM/Visual/Windows/VariantsForm.java
+++ b/src/_VisualDVM/Visual/Windows/VariantsForm.java
@@ -29,6 +29,8 @@ public class VariantsForm implements VariantsWindow {
     public VariantsForm() {
         LoadSplitters();
         Global.mainModule.getProject().parallelVariants.mountUI(variantsPanel);
+        distributionForm1 = new TreeForm(RulesTree.class, distributionPanel);
+        dimensionsForm = new DimensionsTableForm(dimensionsPanel);
         //-
         BDistributed.addActionListener(new ActionListener() {
             @Override
@@ -49,11 +51,6 @@ public class VariantsForm implements VariantsWindow {
             }
         });
     }
-    private void createUIComponents() {
-        // TODO: place custom component creation code here
-        distributionPanel = (distributionForm1 = new TreeForm(RulesTree.class)).getContent();
-        dimensionsPanel = (dimensionsForm = new DimensionsTableForm()).getContent();
-    }
     @Override
     public JPanel getContent() {
         return content;
diff --git a/src/_VisualDVM/Visual/Windows/VersionsForm.form b/src/_VisualDVM/Visual/Windows/VersionsForm.form
index e07df2eb..cd4fda24 100644
--- a/src/_VisualDVM/Visual/Windows/VersionsForm.form
+++ b/src/_VisualDVM/Visual/Windows/VersionsForm.form
@@ -30,7 +30,7 @@
             </properties>
             <border type="none"/>
             <children>
-              <grid id="3dd9a" binding="versionsPanel" custom-create="true" layout-manager="BorderLayout" hgap="0" vgap="0">
+              <grid id="3dd9a" binding="versionsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                 <constraints border-constraint="Center"/>
                 <properties/>
                 <border type="none"/>
diff --git a/src/_VisualDVM/Visual/Windows/VersionsForm.java b/src/_VisualDVM/Visual/Windows/VersionsForm.java
index 4c4d8004..9d563597 100644
--- a/src/_VisualDVM/Visual/Windows/VersionsForm.java
+++ b/src/_VisualDVM/Visual/Windows/VersionsForm.java
@@ -28,6 +28,7 @@ public class VersionsForm implements FormWithSplitters, VersionsWindow {
     public VersionsForm(db_project_info root_in) {
         LoadSplitters();
         root = root_in;
+        versionsTreeForm = new TreeForm(VersionsTree.class, versionsPanel);
         MasterComparsionForm = new VersionsComparisonForm(SlaveComparsionForm = new VersionsComparisonForm(null));
         SC9.setLeftComponent(MasterComparsionForm.getContent());
         SC9.setRightComponent(SlaveComparsionForm.getContent());
@@ -36,10 +37,6 @@ public class VersionsForm implements FormWithSplitters, VersionsWindow {
         versionsTabs.setEnabledAt(0, false);
         versionsPanel.add(Global.mainModule.getUI().getVersionsMenuBar(), BorderLayout.NORTH);
     }
-    private void createUIComponents() {
-        // TODO: place custom component creation code here
-        versionsPanel = (versionsTreeForm = new TreeForm(VersionsTree.class)).getContent();
-    }
     @Override
     public VariantsWindow getVariantsWindow() {
         return variantsForm;