продолжение рефакторинга таблиц. перевод меню баров в интерфейс

.idea/workspace.xml

@@ -7,14 +7,51 @@
   </component>
   <component name="ChangeListManager">
     <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/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/Tables/ColumnFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnFilter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddSubscriber.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/DataTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/DataTree.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSelectedComponents.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/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.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/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.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/Passes/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerObject.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/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.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.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/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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

src/Common/Database/Tables/DataSet.java

@@ -6,7 +6,6 @@ import Common.Passes.PassCode_;
 import Common.Utils.TextLog;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.DataSetFilter;
-import Common.Visual.FilterInterface;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnFilter;
 import Common.Visual.UI;
@@ -14,7 +13,6 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Visual.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
-import java.awt.*;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.Vector;
@@ -28,16 +26,9 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
     public Class<D> d; //класс объектов.
     public LinkedHashMap<K, D> Data = new LinkedHashMap<>(); //наполнение
     //-
-    protected DataSetControlForm ui= null;
-    public DataSetControlForm getUI() {
-        return ui;
-    }
-    public void setUI(DataSetControlForm ui_in) {
-        this.ui = ui_in;
-    }
-    //-
     public LinkedHashMap<Integer, ColumnFilter> columnsFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
-    protected FilterInterface f_ui; // отображение количества объектов
+    //-
+    protected DataSetControlForm ui = null;
     //--
     protected Vector<DataSetFilter<D>> filters = new Vector<>();
     //--
@@ -46,39 +37,14 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         d = d_in;
         Name = d.getSimpleName();
     }
+    public DataSetControlForm getUI() {
+        return ui;
+    }
     protected void createFilters() {
     }
-    public boolean hasMenuBar() {
-        return true;
-    }
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription());
-    }
     public void mountUI(JPanel mountPanel_in) {
         UI.Clear(mountPanel_in);
-        //-->
+        ui = createUI(mountPanel_in);
-        setUI(createUI(mountPanel_in));
-        //-->
-        if (hasMenuBar()) {
-            try {
-                DataMenuBar bar = null;
-                if (!MainModule_.instance.getUI().menuBars.containsKey(getClass())) {
-                    bar = createMenuBar();
-                    if (getUI().hasCheckBox())
-                        bar.createSelectionButtons(this);
-                    MainModule_.instance.getUI().menuBars.put(getClass(), bar);
-                } else {
-                    bar = MainModule_.instance.getUI().menuBars.get(getClass());
-                }
-                mountPanel_in.add(bar, BorderLayout.NORTH);
-                //--
-                setFilterUI(count -> MainModule_.instance.getUI().menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
-                //--
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            }
-        }
-        //----
         createFilters();
         if (!filters.isEmpty()) {
             DataMenuBar menuBar = MainModule_.instance.getUI().menuBars.get(getClass());
@@ -86,31 +52,23 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
                 menuBar.addMenus(filter.menu);
         }
     }
-    public DataSetControlForm getUi() {
-        return getUI();
-    }
-    public void setFilterUI(FilterInterface ui_in) {
-        f_ui = ui_in;
-    }
     public void ClearUI() {
-        if ((getUI() != null) && getUI().isShown()) {
+        if ((ui != null) && ui.isShown()) {
-            getUI().ClearSelection();
+            ui.ClearSelection();
-            getUI().Clear();
+            ui.Clear();
-            if (f_ui != null)
-                f_ui.ShowNoMatches();
         }
     }
     public void RefreshUI() {
-        if (getUI() != null) getUI().Refresh();
+        if (ui != null) ui.Refresh();
     }
     public int getRowCountUI() {
-        return getUI().getRowCount();
+        return ui.getRowCount();
     }
     public void SetCurrentObjectUI(Object pk) {
-        if (getUI() != null) {
+        if (ui != null) {
             //todo возможно проверить, что текущий объект уже соответствует ключу, и если да, то ничего делать.
-            getUI().ClearSelection(); //сброс текущего объекта и всего что с ним связано.
+            ui.ClearSelection(); //сброс текущего объекта и всего что с ним связано.
-            getUI().Select(pk);
+            ui.Select(pk);
         }
     }
     public String[] getUIColumnNames() {
@@ -120,7 +78,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         return null;
     }
     public boolean hasUI() {
-        return getUI() != null;
+        return ui != null;
     }
     public void SelectAll(boolean flag) {
         for (D object : Data.values()) {
@@ -237,10 +195,8 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         for (DataSetFilter<D> filter : filters)
             filter.Drop();
         //--
-        if (getUI() != null) {
+        if (ui != null) {
-            getUI().Show();
+            ui.Show();
-            if (f_ui != null)
-                f_ui.ShowMatchesCount(getRowCountUI());
         }
         //--
         for (DataSetFilter<D> filter : filters)
@@ -250,10 +206,8 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         for (DataSetFilter<D> filter : filters)
             filter.Drop();
         //--
-        if (getUI() != null) {
+        if (ui != null) {
-            getUI().Show(key);
+            ui.Show(key);
-            if (f_ui != null)
-                f_ui.ShowMatchesCount(getRowCountUI());
         }
         //--
         for (DataSetFilter<D> filter : filters)
@@ -326,7 +280,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         if (hasUI()) {
             Object lastPk = selections.get(getClass());
             if ((CurrentName() != null) && (lastPk != null)) {
-                getUI().Select(lastPk);
+                ui.Select(lastPk);
             }
         }
     }

src/Common/Visual/ControlForm.java

@@ -5,18 +5,22 @@ import javax.swing.*;
 import java.awt.*;
 //класс, представляющий собой прокручиваемую панель, на которой лежит нечто.
 public class ControlForm<C extends Component> {
+    protected C control = null;
     JPanel mountPanel = null;  //панель на которую монтируется UI.помимо контрола может содержать меню сверху.
     JPanel scrollPanel = null;   //панель на которой лежит скролл.
     JScrollPane scroll = null;  //панель прокрутки в которую встроен контрол
-    protected C control = null;
     Class<C> control_class = null;
-    public C getControl(){return  control;}
     public ControlForm(Class<C> class_in, JPanel mountPanel_in) {
         control_class = class_in;
         mountPanel = mountPanel_in;
         mountPanel.add((scrollPanel = new JPanel(new BorderLayout())), BorderLayout.CENTER);
     }
-    public JPanel getMountPanel(){return mountPanel;} //todo осталось только в projectForm, вывести
+    public C getControl() {
+        return control;
+    }
+    public JPanel getMountPanel() {
+        return mountPanel;
+    } //todo осталось только в projectForm, вывести
     //новое отображение предполагает полную перерисовку контрола.(?)
     public void Show() {
         Clear();

src/Common/Visual/DataSetControlForm.java

@@ -7,6 +7,7 @@ import Common.Database.Tables.DataSet;
 import Common.Database.Tables.FKBehaviour;
 import Common.MainModule_;
 import Common.Utils.Utils_;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Menus.TableMenu;
 import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Tables.DBObjectSelectionRenderer;
@@ -26,15 +27,35 @@ import java.util.Vector;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 public class DataSetControlForm extends ControlForm<DataTable> {
-
+    protected DataSet dataSource; //источник данных
-    protected DataSet dataSource;
+    protected DataMenuBar bar = null; //верхняя панель меню
-    protected int current_row_i;
+    protected int current_row_i; //индекс текущей строки.
     protected boolean events_on = true;
     protected String colNamesAndSizes = "";
-    protected Vector<ColumnInfo> columns = new Vector<>();
+    protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении
+    FilterInterface f_ui; // отображение количества объектов ( todo слить с баром ?)
     public DataSetControlForm(DataSet dataSource_in, JPanel mountPanel_in) {
         super(DataTable.class, mountPanel_in);
         dataSource = dataSource_in;
+        //--
+        if (hasMenuBar()) {
+            try {
+                if (!MainModule_.instance.getUI().menuBars.containsKey(dataSource.getClass())) {
+                    bar = createMenuBar();
+                    if (hasCheckBox())
+                        bar.createSelectionButtons(dataSource);
+                    MainModule_.instance.getUI().menuBars.put(dataSource.getClass(), bar);
+                } else {
+                    bar = MainModule_.instance.getUI().menuBars.get(dataSource.getClass());
+                }
+                mountPanel.add(bar, BorderLayout.NORTH);
+                //--
+                f_ui = (count -> bar.countLabel.setText(String.valueOf(count)));
+                //--
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        }
     }
     public void SaveColumns() {
         if (MainModule_.instance.getDb() != null) {
@@ -58,9 +79,6 @@ public class DataSetControlForm extends ControlForm<DataTable> {
             }
         }
     }
-    public boolean hasCheckBox() {
-        return false;
-    }
     private Vector<String> getHeaders() {
         return columns.stream().map(ColumnInfo::getName).collect(Collectors.toCollection(Vector::new));
     }
@@ -254,10 +272,18 @@ public class DataSetControlForm extends ControlForm<DataTable> {
             }
         }
     }
+    protected DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription());
+    }
     @Override
     protected void redrawControl() {
         control.CorrectSizes();
     }
+    @Override
+    public void Show() {
+        super.Show();
+        if (f_ui != null) f_ui.ShowMatchesCount(getRowCount());
+    }
     public void Show(Object pk) {
         Show();
         Select(pk);
@@ -267,8 +293,12 @@ public class DataSetControlForm extends ControlForm<DataTable> {
             control.SelectRowByPK(pk);
     }
     public void ClearSelection() {
-        if (isShown())
+        if (isShown()) control.clearSelection(); //строка сбросится сама. благодаря сбросу события выбора
-            control.clearSelection(); //строка сбросится сама. благодаря сбросу события выбора
+    }
+    @Override
+    public void Clear() {
+        super.Clear();
+        if (f_ui != null) f_ui.ShowNoMatches();
     }
     public int getRowCount() {
         return control.getRowCount();
@@ -303,5 +333,13 @@ public class DataSetControlForm extends ControlForm<DataTable> {
             }
         }
     }
-    public void MouseAction2() throws Exception{}
+    public void MouseAction2() throws Exception {
+    }
+    //-
+    public boolean hasCheckBox() {
+        return false;
+    }
+    public boolean hasMenuBar() {
+        return true;
+    }
 }

src/Common/Visual/Tables/ColumnFilter.java

@@ -45,28 +45,28 @@ public class ColumnFilter {
         };
         popup.add(textField);
         //--
-        dataSet.getUi().getControl().getColumnModel().getColumn(columnIndex).setHeaderRenderer((table, value, isSelected, hasFocus, row, column1) -> new JLabel() {
+        dataSet.getUI().getControl().getColumnModel().getColumn(columnIndex).setHeaderRenderer((table, value, isSelected, hasFocus, row, column1) -> new JLabel() {
             {
                 setIcon(Utils_.getIcon("/Common/icons/Filter.png"));
-                setForeground(dataSet.getUi().getControl().getTableHeader().getForeground());
+                setForeground(dataSet.getUI().getControl().getTableHeader().getForeground());
-                setBackground(dataSet.getUi().getControl().getTableHeader().getBackground());
+                setBackground(dataSet.getUI().getControl().getTableHeader().getBackground());
-                setFont(dataSet.getUi().getControl().getTableHeader().getFont());
+                setFont(dataSet.getUI().getControl().getTableHeader().getFont());
                 setBorder(new MatteBorder(0, 0, 1, 1, Color.DARK_GRAY));
                 setText("текст : " + dataSet.getColumnFilterValue(columnIndex));
             }
         });
         //--
-        dataSet.getUi().getControl().getTableHeader().addMouseListener(new MouseAdapter() {
+        dataSet.getUI().getControl().getTableHeader().addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent event) {
                 if (event.getClickCount() == 1) {
-                    int columnIndex = dataSet.getUi().getControl().getTableHeader().columnAtPoint(event.getPoint());
+                    int columnIndex = dataSet.getUI().getControl().getTableHeader().columnAtPoint(event.getPoint());
                     if (dataSet.columnsFilters.containsKey(columnIndex)) {
-                        Rectangle columnRectangle = dataSet.getUi().getControl().getTableHeader().getHeaderRect(columnIndex);
+                        Rectangle columnRectangle = dataSet.getUI().getControl().getTableHeader().getHeaderRect(columnIndex);
                         Dimension d = new Dimension(columnRectangle.width - 72, columnRectangle.height - 1);
                         popup.setPreferredSize(d);
                         popup.setMaximumSize(d);
-                        popup.show(dataSet.getUi().getControl().getTableHeader(), columnRectangle.x + 72, 0);
+                        popup.show(dataSet.getUI().getControl().getTableHeader(), columnRectangle.x + 72, 0);
                         textField.setText(dataSet.getColumnFilterValue(columnIndex).toString());
                         textField.requestFocusInWindow();
                         textField.selectAll();

src/Common/Visual/Trees/DataTree.java

@@ -5,7 +5,7 @@ import Common.Utils.Utils_;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
-public class DataTree extends StyledTree{
+public class DataTree extends StyledTree {
     public DataTree(DefaultMutableTreeNode root_in) {
         super(root_in);
     }

src/Common/Visual/Trees/TreeForm.java

@@ -1,9 +1,7 @@
 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, JPanel mountPanel_in) {
         super(class_in, mountPanel_in);

src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java

@@ -121,7 +121,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
@@ -140,6 +140,14 @@ public class CompilersDBTable extends iDBTable<Compiler> {
             public boolean hasCheckBox() {
                 return true;
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(), PassCode.AddCompiler,
+                        PassCode.EditCompiler,
+                        PassCode.DeleteCompiler,
+                        PassCode.ShowCompilerVersion,
+                        PassCode.ShowCompilerHelp);
+            }
         };
     }
     @Override
@@ -165,14 +173,6 @@ public class CompilersDBTable extends iDBTable<Compiler> {
         return Current.Compiler;
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.AddCompiler,
-                PassCode.EditCompiler,
-                PassCode.DeleteCompiler,
-                PassCode.ShowCompilerVersion,
-                PassCode.ShowCompilerHelp);
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteCompiler;
     }

src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java

@@ -29,7 +29,7 @@ public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;

src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java

@@ -31,7 +31,7 @@ public class CompilerOptionsSet extends DataSet<String, CompilerOption> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;

src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java

@@ -45,11 +45,18 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(),
+                        PassCode.AddDVMParameter,
+                        PassCode.EditDVMParameter,
+                        PassCode.DeleteDVMParameter);
+            }
         };
     }
     @Override
@@ -101,13 +108,6 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
         };
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
-                PassCode.AddDVMParameter,
-                PassCode.EditDVMParameter,
-                PassCode.DeleteDVMParameter);
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteDVMParameter;
     }

src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java

@@ -70,11 +70,19 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(),
+                        PassCode.AddEnvironmentValue,
+                        PassCode.EditEnvironmentValue,
+                        PassCode.DeleteEnvironmentValue,
+                        PassCode.PickCompilerEnvironments);
+            }
         };
     }
     @Override
@@ -101,14 +109,6 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
         return null;
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
-                PassCode.AddEnvironmentValue,
-                PassCode.EditEnvironmentValue,
-                PassCode.DeleteEnvironmentValue,
-                PassCode.PickCompilerEnvironments);
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteEnvironmentValue;
     }

src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java

@@ -10,7 +10,7 @@ public class DirInfosDataSet extends DataSet<String, DirInfo> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(1).setRendererClass(RendererDate.class);

src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java

@@ -90,7 +90,7 @@ public class MachinesDBTable extends iDBTable<Machine> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
@@ -111,6 +111,28 @@ public class MachinesDBTable extends iDBTable<Machine> {
             public boolean hasCheckBox() {
                 return true;
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(),
+                        PassCode.AddMachine,
+                        PassCode.EditMachine,
+                        PassCode.DeleteMachine) {
+                    {
+                        add(new MenuBarButton() {
+                            {
+                                setIcon("/Common/icons/SilverArrowUp.png");
+                                setToolTipText("Свернуть");
+                                addActionListener(new ActionListener() {
+                                    @Override
+                                    public void actionPerformed(ActionEvent e) {
+                                        Global.mainModule.getPass(PassCode.UpdateProperty).Do("collapseCredentials", true);
+                                    }
+                                });
+                            }
+                        }, 0);
+                    }
+                };
+            }
         };
     }
     @Override
@@ -134,28 +156,6 @@ public class MachinesDBTable extends iDBTable<Machine> {
         return Data.values().stream().anyMatch(machine -> machine.type.equals(MachineType.Local));
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
-                PassCode.AddMachine,
-                PassCode.EditMachine,
-                PassCode.DeleteMachine) {
-            {
-                add(new MenuBarButton() {
-                    {
-                        setIcon("/Common/icons/SilverArrowUp.png");
-                        setToolTipText("Свернуть");
-                        addActionListener(new ActionListener() {
-                            @Override
-                            public void actionPerformed(ActionEvent e) {
-                                Global.mainModule.getPass(PassCode.UpdateProperty).Do("collapseCredentials", true);
-                            }
-                        });
-                    }
-                }, 0);
-            }
-        };
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteMachine;
     }

src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java

@@ -42,7 +42,7 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
@@ -51,6 +51,19 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
             public boolean hasCheckBox() {
                 return true;
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(),
+                        PassCode.Compile,
+                        PassCode.AddMakefile,
+                        PassCode.EditMakefile,
+                        PassCode.DeleteMakefile) {
+                    {
+                        addSeparator();
+                        addPasses(PassCode.ShowMakefilePreview, PassCode.EditProjectCompilationMaxtime);
+                    }
+                };
+            }
         };
     }
     @Override
@@ -79,18 +92,6 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
         return Current.Makefile;
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.Compile,
-                PassCode.AddMakefile,
-                PassCode.EditMakefile,
-                PassCode.DeleteMakefile) {
-            {
-                addSeparator();
-                addPasses(PassCode.ShowMakefilePreview, PassCode.EditProjectCompilationMaxtime);
-            }
-        };
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteMakefile;
     }

src/_VisualDVM/GlobalData/Module/ModulesDBTable.java

@@ -27,7 +27,7 @@ public class ModulesDBTable extends iDBTable<Module> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
@@ -36,6 +36,10 @@ public class ModulesDBTable extends iDBTable<Module> {
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(), PassCode.EditModule);
+            }
         };
     }
     @Override
@@ -66,8 +70,4 @@ public class ModulesDBTable extends iDBTable<Module> {
     public Current CurrentName() {
         return Current.Module;
     }
-    @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.EditModule);
-    }
 }

src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java

@@ -16,7 +16,7 @@ public class RemoteFileChooserFields implements DialogFields {
     private JButton bBack;
     private JButton bHome;
     public RemoteFileChooserFields() {
-        treeForm = new TreeForm(RemoteFilesTree.class,TreePanel);
+        treeForm = new TreeForm(RemoteFilesTree.class, TreePanel);
         bBack.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -32,7 +32,6 @@ public class RemoteFileChooserFields implements DialogFields {
     }
     private void createUIComponents() {
         // TODO: place custom component creation code here
-
     }
     @Override
     public Component getContent() {

src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java

@@ -119,11 +119,24 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(),
+                        PassCode.Run,
+                        PassCode.AddRunConfiguration,
+                        PassCode.EditRunConfiguration,
+                        PassCode.DeleteRunConfiguration) {
+                    {
+                        add(new JSeparator());
+                        addPasses(PassCode.EditProjectRunMaxtime);
+                    }
+                };
+            }
         };
     }
     @Override
@@ -170,19 +183,6 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
         }
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
-                PassCode.Run,
-                PassCode.AddRunConfiguration,
-                PassCode.EditRunConfiguration,
-                PassCode.DeleteRunConfiguration) {
-            {
-                add(new JSeparator());
-                addPasses(PassCode.EditProjectRunMaxtime);
-            }
-        };
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteRunConfiguration;
     }

src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java

@@ -30,11 +30,19 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(),
+                        PassCode.SaveProfile,
+                        PassCode.EditProfile,
+                        PassCode.ApplyProfile,
+                        PassCode.DeleteProfile);
+            }
         };
     }
     @Override
@@ -83,14 +91,6 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
         return res;
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
-                PassCode.SaveProfile,
-                PassCode.EditProfile,
-                PassCode.ApplyProfile,
-                PassCode.DeleteProfile);
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteProfile;
     }

src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java

@@ -9,16 +9,16 @@ public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting>
         super(SapforProfileSetting.class);
     }
     @Override
-    public boolean hasMenuBar() {
-        return false;
-    }
-    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
             }
+            @Override
+            public boolean hasMenuBar() {
+                return false;
+            }
         };
     }
     @Override

src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java

@@ -36,7 +36,7 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
@@ -56,6 +56,10 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
                 super.ShowNoCurrentObject();
                 Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(), PassCode.DeleteCompilationTasks);
+            }
         };
     }
     @Override
@@ -114,10 +118,6 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
         return Current.CompilationTask;
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.DeleteCompilationTasks);
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteCompilationTasks;
     }

src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java

@@ -24,7 +24,7 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
@@ -44,6 +44,10 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
                 super.ShowNoCurrentObject();
                 Global.mainModule.getUI().getDebugWindow().ShowNoCurrentRunTask();
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(), PassCode.DeleteRunTasks);
+            }
         };
     }
     @Override
@@ -80,10 +84,6 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
         return Current.RunTask;
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.DeleteRunTasks);
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteRunTasks;
     }

src/_VisualDVM/GlobalData/User/UsersDBTable.java

@@ -75,7 +75,7 @@ public class UsersDBTable extends iDBTable<User> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
@@ -97,6 +97,14 @@ public class UsersDBTable extends iDBTable<User> {
             public boolean hasCheckBox() {
                 return true;
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(),
+                        PassCode.AddUser,
+                        PassCode.EditUser,
+                        PassCode.InitialiseUser,
+                        PassCode.DeleteUser);
+            }
         };
     }
     @Override
@@ -119,14 +127,6 @@ public class UsersDBTable extends iDBTable<User> {
         return Current.User;
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
-                PassCode.AddUser,
-                PassCode.EditUser,
-                PassCode.InitialiseUser,
-                PassCode.DeleteUser);
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteUser;
     }

src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java

@@ -20,7 +20,7 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
@@ -29,6 +29,15 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
             protected void AdditionalInitColumns() {
                 columns.get(1).setEditable(false);
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription()) {
+                    @Override
+                    public void createSelectionButtons(DataSet dataSet) {
+                        //не нужны.
+                    }
+                };
+            }
         };
     }
     @Override
@@ -50,13 +59,4 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
     public Current CurrentName() {
         return Current.DBArray;
     }
-    @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription()) {
-            @Override
-            public void createSelectionButtons(DataSet dataSet) {
-                //не нужны.
-            }
-        };
-    }
 }

src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java

@@ -20,7 +20,7 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         DataSet dataset = this;
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
@@ -54,6 +54,10 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
                 //  sorter.setSortKeys(sortKeys);
                 //  sorter.sort();
             }
+            @Override
+            public boolean hasMenuBar() {
+                return false;
+            }
         };
     }
     @Override
@@ -77,8 +81,4 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
     public Comparator<M> getComparator() {
         return Comparator.comparingInt(o -> o.line);
     }
-    @Override
-    public boolean hasMenuBar() {
-        return false;
-    }
 }

src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java

@@ -16,20 +16,20 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
                 columns.get(1).setMinWidth(700);
                 columns.get(1).setRendererClass(RendererWrapText.class);
             }
+            @Override
+            public boolean hasMenuBar() {
+                return false;
+            }
         };
     }
     @Override
-    public boolean hasMenuBar() {
-        return false;
-    }
-    @Override
     public String[] getUIColumnNames() {
         return new String[]{"текст"};
     }

src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java

@@ -29,7 +29,7 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;

src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java

@@ -3,17 +3,15 @@ import Common.MainModule_;
 import Common.Visual.ControlForm;
 import Common.Visual.Tables.Grid.GridAnchestor;
 import Common.Visual.Tables.StyledTable;
-import Common.Visual.UI;
 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(JPanel mountPanel_in) {
-        super(StyledTable.class,mountPanel_in);
+        super(StyledTable.class, mountPanel_in);
     }
     @Override
     protected void createControl() {

src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java

@@ -26,7 +26,7 @@ public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);

src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java

@@ -20,7 +20,7 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
@@ -34,6 +34,14 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
                 columns.get(columns.size() - 3).setRendererClass(RendererVariantRank.class);
                 columns.get(columns.size() - 2).setRendererClass(RendererDate.class);
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(),
+                        PassCode.ShowAllParallelVariants,
+                        PassCode.ShowParallelVariantsCoverage,
+                        PassCode.PredictParallelVariants,
+                        PassCode.CreateParallelVariants);
+            }
         };
     }
     @Override
@@ -76,12 +84,4 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
     public Current CurrentName() {
         return Current.ParallelVariant;
     }
-    @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
-                PassCode.ShowAllParallelVariants,
-                PassCode.ShowParallelVariantsCoverage,
-                PassCode.PredictParallelVariants,
-                PassCode.CreateParallelVariants);
-    }
 }

src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java

@@ -30,7 +30,7 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
@@ -67,6 +67,19 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
                     }
                 });
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(),
+                        PassCode.SynchronizeBugReports,
+                        PassCode.DownloadAllBugReportsArchives,
+                        PassCode.AddBugReport,
+                        PassCode.PublishBugReport,
+                        PassCode.OpenBugReportTestProject,
+                        PassCode.OpenBugReport,
+                        PassCode.UpdateBugReportProgress,
+                        PassCode.CloseBugReport,
+                        PassCode.DeleteBugReport);
+            }
         };
     }
     @Override
@@ -115,19 +128,6 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
         return Data.values().stream().filter(bugReport -> bugReport.state.equals(BugReportState.draft)).collect(Collectors.toCollection(Vector::new));
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
-                PassCode.SynchronizeBugReports,
-                PassCode.DownloadAllBugReportsArchives,
-                PassCode.AddBugReport,
-                PassCode.PublishBugReport,
-                PassCode.OpenBugReportTestProject,
-                PassCode.OpenBugReport,
-                PassCode.UpdateBugReportProgress,
-                PassCode.CloseBugReport,
-                PassCode.DeleteBugReport);
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteBugReport;
     }

src/_VisualDVM/Repository/Component/ComponentsSet.java

@@ -27,7 +27,7 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
@@ -39,6 +39,27 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
                 columns.get(4).setRendererClass(RendererMaskedNanInteger.class);
                 columns.get(6).setRendererClass(RendererStatusEnum.class);
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(), PassCode.InstallComponentFromFolder,
+                        PassCode.UpdateSelectedComponents,
+                        PassCode.PublishComponent,
+                        PassCode.ShowComponentChangesLog) {
+                    {
+                        addMenus(
+                                new VisualiserMenu(
+                                        "Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
+                                    {
+                                        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
+                                        add(Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem());
+                                        add(Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem());
+                                    }
+                                }
+                        );
+                        Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
+                    }
+                };
+            }
         };
     }
     @Override
@@ -91,25 +112,4 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
             target.add(server);
         return target;
     }
-    @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.InstallComponentFromFolder,
-                PassCode.UpdateSelectedComponents,
-                PassCode.PublishComponent,
-                PassCode.ShowComponentChangesLog) {
-            {
-                addMenus(
-                        new VisualiserMenu(
-                                "Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
-                            {
-                                setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
-                                add(Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem());
-                                add(Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem());
-                            }
-                        }
-                );
-                Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
-            }
-        };
-    }
 }

src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java

@@ -37,7 +37,12 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel);
+        return new DataSetControlForm(this, mountPanel) {
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
+            }
+        };
     }
     @Override
     public Object getFieldAt(SubscriberWorkspace object, int columnIndex) {
@@ -52,10 +57,6 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
         return null;
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteSubscriberWorkspace;
     }

src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java

@@ -32,7 +32,7 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
@@ -45,6 +45,15 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
                 columns.get(3).setVisible(admin);
                 columns.get(4).setVisible(admin);
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(),
+                        PassCode.SaveBugReportExecutor,
+                        PassCode.SaveBugReportRecipients,
+                        PassCode.AddSubscriber,
+                        PassCode.EditSubscriber,
+                        PassCode.DeleteSubscriber);
+            }
         };
     }
     @Override
@@ -79,15 +88,6 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
         return res;
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
-                PassCode.SaveBugReportExecutor,
-                PassCode.SaveBugReportRecipients,
-                PassCode.AddSubscriber,
-                PassCode.EditSubscriber,
-                PassCode.DeleteSubscriber);
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteSubscriber;
     }

src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java

@@ -76,11 +76,38 @@ public class GroupsDBTable extends iDBTable<Group> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(),
+                        PassCode.SynchronizeTests,
+                        PassCode.ConvertCorrectnessTests) {
+                    {
+                        addMenus(new AddGroupMenu(), new EditGroupMenu());
+                        addPasses(PassCode.DeleteGroup);
+                        add(new JSeparator());
+                        add(new MenuBarButton() {
+                            {
+                                setText("Свои");
+                                setToolTipText("Отображать только группы тестов авторства пользователя");
+                                Mark();
+                                addActionListener(e -> {
+                                    GroupsDBTable.filterMyOnly = !GroupsDBTable.filterMyOnly;
+                                    Mark();
+                                    Global.testingServer.db.groups.ShowUI();
+                                });
+                            }
+                            public void Mark() {
+                                setIcon(Utils_.getIcon(GroupsDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
+                            }
+                        });
+                    }
+                };
+            }
         };
     }
     @Override
@@ -155,33 +182,6 @@ public class GroupsDBTable extends iDBTable<Group> {
         return null;
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
-                PassCode.SynchronizeTests,
-                PassCode.ConvertCorrectnessTests) {
-            {
-                addMenus(new AddGroupMenu(), new EditGroupMenu());
-                addPasses(PassCode.DeleteGroup);
-                add(new JSeparator());
-                add(new MenuBarButton() {
-                    {
-                        setText("Свои");
-                        setToolTipText("Отображать только группы тестов авторства пользователя");
-                        Mark();
-                        addActionListener(e -> {
-                            GroupsDBTable.filterMyOnly = !GroupsDBTable.filterMyOnly;
-                            Mark();
-                            Global.testingServer.db.groups.ShowUI();
-                        });
-                    }
-                    public void Mark() {
-                        setIcon(Utils_.getIcon(GroupsDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
-                    }
-                });
-            }
-        };
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteGroup;
     }

src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java

@@ -28,15 +28,23 @@ public class TestDBTable extends iDBTable<Test> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
-                //columns.get(0).setVisible(false);
             }
             @Override
             public boolean hasCheckBox() {
                 return true;
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription()) {
+                    {
+                        addMenus(new AddTestMenu(), new EditTestMenu());
+                        addPasses(PassCode.DownloadTest, PassCode.DeleteTest);
+                    }
+                };
+            }
         };
     }
     @Override
@@ -131,15 +139,6 @@ public class TestDBTable extends iDBTable<Test> {
         return selectedTests.isEmpty() ? allTests : selectedTests;
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription()) {
-            {
-                addMenus(new AddTestMenu(), new EditTestMenu());
-                addPasses(PassCode.DownloadTest, PassCode.DeleteTest);
-            }
-        };
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteTest;
     }

src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java

@@ -32,7 +32,7 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
@@ -42,6 +42,16 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
                 columns.get(6).setRendererClass(RendererMultiline.class);
                 columns.get(6).setMaxWidth(500);
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(),
+                        PassCode.PublishConfiguration,
+                        PassCode.EditConfiguration,
+                        PassCode.ShowCurrentDVMConfigurationTests,
+                        PassCode.SaveCurrentDVMConfiguration,
+                        PassCode.DeleteConfiguration,
+                        PassCode.StartSelectedDVMConfigurations);
+            }
         };
     }
     @Override
@@ -120,16 +130,6 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
         return (Global.mainModule.getAccount().CheckAccessRights(((DVMConfiguration) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
-                PassCode.PublishConfiguration,
-                PassCode.EditConfiguration,
-                PassCode.ShowCurrentDVMConfigurationTests,
-                PassCode.SaveCurrentDVMConfiguration,
-                PassCode.DeleteConfiguration,
-                PassCode.StartSelectedDVMConfigurations);
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteConfiguration;
     }

src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java

@@ -38,7 +38,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
@@ -69,6 +69,51 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
             public void MouseAction2() throws Exception {
                 Global.mainModule.getPass(PassCode.DownloadDVMPackage).Do();
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription()) {
+                    {
+                        addPasses(PassCode.SynchronizeTests);
+                        addSeparator();
+                        addPasses(PassCode.AbortDVMPackage);
+                        addSeparator();
+                        addPasses(PassCode.DownloadDVMPackage,
+                                PassCode.ExportDVMPackageToExcel,
+                                PassCode.DeleteDVMPackage);
+                        add(new JSeparator());
+                        add(new MenuBarButton() {
+                            {
+                                setText("Свои");
+                                setToolTipText("Отображать только пакеты тестов авторства пользователя");
+                                Mark();
+                                addActionListener(e -> {
+                                    DVMPackageDBTable.filterMyOnly = !DVMPackageDBTable.filterMyOnly;
+                                    Mark();
+                                    Global.testingServer.db.dvmPackages.ShowUI();
+                                });
+                            }
+                            public void Mark() {
+                                setIcon(Utils_.getIcon(DVMPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
+                            }
+                        });
+                        add(new MenuBarButton() {
+                            {
+                                setText("Активные");
+                                setToolTipText("Отображать только активные пакеты тестов");
+                                Mark();
+                                addActionListener(e -> {
+                                    DVMPackageDBTable.filterActive = !DVMPackageDBTable.filterActive;
+                                    Mark();
+                                    Global.testingServer.db.dvmPackages.ShowUI();
+                                });
+                            }
+                            public void Mark() {
+                                setIcon(Utils_.getIcon(DVMPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
+                            }
+                        });
+                    }
+                };
+            }
         };
     }
     @Override
@@ -128,51 +173,6 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
         // return Comparator.comparingInt(o -> o.).reversed();
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription()) {
-            {
-                addPasses(PassCode.SynchronizeTests);
-                addSeparator();
-                addPasses(PassCode.AbortDVMPackage);
-                addSeparator();
-                addPasses(PassCode.DownloadDVMPackage,
-                        PassCode.ExportDVMPackageToExcel,
-                        PassCode.DeleteDVMPackage);
-                add(new JSeparator());
-                add(new MenuBarButton() {
-                    {
-                        setText("Свои");
-                        setToolTipText("Отображать только пакеты тестов авторства пользователя");
-                        Mark();
-                        addActionListener(e -> {
-                            DVMPackageDBTable.filterMyOnly = !DVMPackageDBTable.filterMyOnly;
-                            Mark();
-                            Global.testingServer.db.dvmPackages.ShowUI();
-                        });
-                    }
-                    public void Mark() {
-                        setIcon(Utils_.getIcon(DVMPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
-                    }
-                });
-                add(new MenuBarButton() {
-                    {
-                        setText("Активные");
-                        setToolTipText("Отображать только активные пакеты тестов");
-                        Mark();
-                        addActionListener(e -> {
-                            DVMPackageDBTable.filterActive = !DVMPackageDBTable.filterActive;
-                            Mark();
-                            Global.testingServer.db.dvmPackages.ShowUI();
-                        });
-                    }
-                    public void Mark() {
-                        setIcon(Utils_.getIcon(DVMPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
-                    }
-                });
-            }
-        };
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteDVMPackage;
     }

src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java

@@ -71,20 +71,18 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
     //-
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
             }
             @Override
-            protected void AdditionalInitColumns() {
+            public DataMenuBar createMenuBar() {
-                /*
+                return new DataMenuBar(getPluralDescription(),
-                columns.get(5).setRenderer(TableRenderers.RendererMultiline);
+                        PassCode.PublishDVMSettings,
-                columns.get(5).setMaxWidth(500);
+                        PassCode.CloneDVMSettings,
-                columns.get(7).setRenderer(TableRenderers.RendererMultiline);
+                        PassCode.EditDVMSettings,
-                columns.get(8).setRenderer(TableRenderers.RendererMultiline);
+                        PassCode.DeleteDVMSettings);
-                columns.get(15).setRenderer(TableRenderers.RendererMultiline);
-                 */
             }
         };
     }
@@ -150,14 +148,6 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
         return (Global.mainModule.getAccount().CheckAccessRights(((DVMSettings) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
-                PassCode.PublishDVMSettings,
-                PassCode.CloneDVMSettings,
-                PassCode.EditDVMSettings,
-                PassCode.DeleteDVMSettings);
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteDVMSettings;
     }

src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java

@@ -62,7 +62,7 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
@@ -73,6 +73,10 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
                 columns.get(6).setRendererClass(RendererStatusEnum.class);
                 columns.get(13).setRendererClass(RendererProgressBar.class);
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
+            }
         };
     }
     @Override
@@ -164,8 +168,4 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
         };
         // return Comparator.comparingInt(o -> o.).reversed();
     }
-    @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
-    }
 }

src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java

@@ -34,7 +34,7 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
@@ -49,6 +49,16 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
                 columns.get(7).setRendererClass(RendererMultiline.class);
                 columns.get(7).setMaxWidth(500);
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(),
+                        PassCode.PublishSapforConfiguration,
+                        PassCode.EditSapforConfiguration,
+                        PassCode.ShowCurrentSAPFORConfigurationTests,
+                        PassCode.SaveCurrentSAPFORConfiguration,
+                        PassCode.DeleteSapforConfiguration,
+                        PassCode.StartSelectedSAPFORConfigurations);
+            }
         };
     }
     @Override
@@ -133,16 +143,6 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
         return null;
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
-                PassCode.PublishSapforConfiguration,
-                PassCode.EditSapforConfiguration,
-                PassCode.ShowCurrentSAPFORConfigurationTests,
-                PassCode.SaveCurrentSAPFORConfiguration,
-                PassCode.DeleteSapforConfiguration,
-                PassCode.StartSelectedSAPFORConfigurations);
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteSapforConfiguration;
     }

src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java

@@ -38,7 +38,7 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
@@ -55,6 +55,50 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
             public void MouseAction2() throws Exception {
                 Global.mainModule.getPass(PassCode.CompareSapforPackages).Do();
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(), PassCode.SynchronizeTests) {
+                    {
+                        addSeparator();
+                        addPasses(PassCode.AbortSapforPackage);
+                        addSeparator();
+                        addPasses(PassCode.CompareSapforPackages);
+                        addSeparator();
+                        addPasses(PassCode.DeleteSapforPackage);
+                        add(new JSeparator());
+                        add(new MenuBarButton() {
+                            {
+                                setText("Свои");
+                                setToolTipText("Отображать только пакеты тестов авторства пользователя");
+                                Mark();
+                                addActionListener(e -> {
+                                    SapforPackageDBTable.filterMyOnly = !SapforPackageDBTable.filterMyOnly;
+                                    Mark();
+                                    Global.testingServer.db.sapforPackages.ShowUI();
+                                });
+                            }
+                            public void Mark() {
+                                setIcon(Utils_.getIcon(SapforPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
+                            }
+                        });
+                        add(new MenuBarButton() {
+                            {
+                                setText("Активные");
+                                setToolTipText("Отображать только активные пакеты тестов");
+                                Mark();
+                                addActionListener(e -> {
+                                    SapforPackageDBTable.filterActive = !SapforPackageDBTable.filterActive;
+                                    Mark();
+                                    Global.testingServer.db.sapforPackages.ShowUI();
+                                });
+                            }
+                            public void Mark() {
+                                setIcon(Utils_.getIcon(SapforPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
+                            }
+                        });
+                    }
+                };
+            }
         };
     }
     @Override
@@ -108,50 +152,6 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
         // return Comparator.comparingInt(o -> o.).reversed();
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.SynchronizeTests) {
-            {
-                addSeparator();
-                addPasses(PassCode.AbortSapforPackage);
-                addSeparator();
-                addPasses(PassCode.CompareSapforPackages);
-                addSeparator();
-                addPasses(PassCode.DeleteSapforPackage);
-                add(new JSeparator());
-                add(new MenuBarButton() {
-                    {
-                        setText("Свои");
-                        setToolTipText("Отображать только пакеты тестов авторства пользователя");
-                        Mark();
-                        addActionListener(e -> {
-                            SapforPackageDBTable.filterMyOnly = !SapforPackageDBTable.filterMyOnly;
-                            Mark();
-                            Global.testingServer.db.sapforPackages.ShowUI();
-                        });
-                    }
-                    public void Mark() {
-                        setIcon(Utils_.getIcon(SapforPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
-                    }
-                });
-                add(new MenuBarButton() {
-                    {
-                        setText("Активные");
-                        setToolTipText("Отображать только активные пакеты тестов");
-                        Mark();
-                        addActionListener(e -> {
-                            SapforPackageDBTable.filterActive = !SapforPackageDBTable.filterActive;
-                            Mark();
-                            Global.testingServer.db.sapforPackages.ShowUI();
-                        });
-                    }
-                    public void Mark() {
-                        setIcon(Utils_.getIcon(SapforPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
-                    }
-                });
-            }
-        };
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteSapforPackage;
     }

src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java

@@ -34,20 +34,18 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
             }
             @Override
-            protected void AdditionalInitColumns() {
+            public DataMenuBar createMenuBar() {
-                /*
+                return new DataMenuBar(getPluralDescription(),
-                columns.get(5).setRenderer(TableRenderers.RendererAutoConfiguration);
+                        PassCode.PublishSapforSettings,
-                columns.get(5).setEditor(TableEditors.EditorAutoConfiguration);
+                        PassCode.CloneSapforSettings,
-                columns.get(5).setMinWidth(25);
+                        PassCode.EditSapforSettings,
-                columns.get(5).setMaxWidth(25);
+                        PassCode.DeleteSapforSettings);
-                columns.get(6).setMaxWidth(300);
-                 */
             }
         };
     }
@@ -120,14 +118,6 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
         return res;
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
-                PassCode.PublishSapforSettings,
-                PassCode.CloneSapforSettings,
-                PassCode.EditSapforSettings,
-                PassCode.DeleteSapforSettings);
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteSapforSettings;
     }

src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java

@@ -46,14 +46,17 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             public boolean hasCheckBox() {
                 return true;
             }
             @Override
-            protected void AdditionalInitColumns() {
+            public DataMenuBar createMenuBar() {
-                //columns.get(0).setVisible(false);
+                return new DataMenuBar(getPluralDescription(),
+                        PassCode.PublishSapforSettingsCommand,
+                        PassCode.EditSapforSettingsCommand,
+                        PassCode.DeleteSapforSettingsCommand);
             }
         };
     }
@@ -85,13 +88,6 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
         return res;
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
-                PassCode.PublishSapforSettingsCommand,
-                PassCode.EditSapforSettingsCommand,
-                PassCode.DeleteSapforSettingsCommand);
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteSapforSettingsCommand;
     }

src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java

@@ -47,7 +47,7 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new DataSetControlForm(this,mountPanel) {
+        return new DataSetControlForm(this, mountPanel) {
             @Override
             protected void AdditionalInitColumns() {
                 // columns.get(0).setVisible(false);
@@ -68,6 +68,14 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
             public boolean hasCheckBox() {
                 return true;
             }
+            @Override
+            public DataMenuBar createMenuBar() {
+                return new DataMenuBar(getPluralDescription(),
+                        PassCode.CompileServerSapfor,
+                        PassCode.ShowSapforCompilationOut,
+                        PassCode.ShowSapforCompilationErr,
+                        PassCode.DeleteServerSapfor);
+            }
         };
     }
     @Override
@@ -81,14 +89,6 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
         // return Comparator.comparingInt(o -> o.).reversed();
     }
     @Override
-    public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
-                PassCode.CompileServerSapfor,
-                PassCode.ShowSapforCompilationOut,
-                PassCode.ShowSapforCompilationErr,
-                PassCode.DeleteServerSapfor);
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteServerSapfor;
     }