From b871d2673b3cf389d31b70627e0b78fd67356428 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 17 Oct 2024 22:18:10 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 35 ++-----------------
 src/Common/Database/Tables/DataSet.java       |  3 --
 src/Common/Visual/DataSetControlForm.java     | 34 +++++++++---------
 src/Common/Visual/DataSetFiltersMenu.java     |  6 ++--
 ...olumnFilter.java => HeaderTextFilter.java} |  6 ++--
 .../FileObject/DirInfosDataSet.java           |  1 -
 .../ProjectData/Messages/MessagesDBTable.java |  4 +--
 .../BugReport/BugReportsDBTable.java          |  1 -
 .../Common/Group/GroupsDBTable.java           |  5 ++-
 .../DVM/DVMTasks/DVMRunTasksSet.java          |  4 +--
 10 files changed, 32 insertions(+), 67 deletions(-)
 rename src/Common/Visual/Tables/{ColumnFilter.java => HeaderTextFilter.java} (94%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 88ac2052..2c18ba1f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,46 +7,15 @@
   </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/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetFiltersMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetFiltersMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnHeaderTextFilter.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/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/Passes/All/Run.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Run.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/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" />
diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java
index 3bb8e78e..c26d3ce5 100644
--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -5,7 +5,6 @@ import Common.MainModule_;
 import Common.Passes.PassCode_;
 import Common.Utils.TextLog;
 import Common.Visual.DataSetControlForm;
-import Common.Visual.Tables.ColumnFilter;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Visual.Windows.Dialog.DialogFields;
@@ -24,8 +23,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
     public Class<D> d; //класс объектов.
     public LinkedHashMap<K, D> Data = new LinkedHashMap<>(); //наполнение
     //-
-    public LinkedHashMap<Integer, ColumnFilter> columnsFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
-    //-
     protected DataSetControlForm ui = null;
     //--
     public DataSet(Class<K> k_in, Class<D> d_in) {
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index 4045d8f6..d8d72248 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -9,10 +9,7 @@ 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;
-import Common.Visual.Tables.DBObjectSelector;
-import Common.Visual.Tables.DataTable;
+import Common.Visual.Tables.*;
 import Common.Visual.Tables.Grid.GridAnchestor;
 
 import javax.swing.*;
@@ -23,6 +20,7 @@ import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.Arrays;
+import java.util.LinkedHashMap;
 import java.util.Vector;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -33,12 +31,10 @@ public class DataSetControlForm extends ControlForm<DataTable> {
     protected boolean events_on = true;
     protected String colNamesAndSizes = "";
     protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении
-    protected String[] getUIColumnNames() {
-        return new String[]{};
-    }
+    protected Vector<DataSetFiltersMenu> filtersMenus = new Vector<>();
+    public LinkedHashMap<Integer, HeaderTextFilter> headersTextFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
     //фильтры и подсчеты. todo слить с баром (?)
     MatchesCounter f_ui = null;
-    protected Vector<DataSetFiltersMenu> filters = new Vector<>();
     public DataSetControlForm(DataSet dataSource_in, JPanel mountPanel_in) {
         super(DataTable.class, mountPanel_in);
         dataSource = dataSource_in;
@@ -58,8 +54,8 @@ public class DataSetControlForm extends ControlForm<DataTable> {
                 f_ui = (count -> bar.countLabel.setText(String.valueOf(count)));
                 //--
                 createFilters();
-                if (!filters.isEmpty()) {
-                    for (DataSetFiltersMenu filter : filters)
+                if (!filtersMenus.isEmpty()) {
+                    for (DataSetFiltersMenu filter : filtersMenus)
                         bar.addMenus(filter.getMenu());
                 }
             } catch (Exception ex) {
@@ -67,6 +63,9 @@ public class DataSetControlForm extends ControlForm<DataTable> {
             }
         }
     }
+    protected String[] getUIColumnNames() {
+        return new String[]{};
+    }
     public void SaveColumns() {
         if (MainModule_.instance.getDb() != null) {
             try {
@@ -285,17 +284,18 @@ public class DataSetControlForm extends ControlForm<DataTable> {
     protected DataMenuBar createMenuBar() {
         return new DataMenuBar(dataSource.getPluralDescription());
     }
-    protected void createFilters() {}
-    protected boolean applyFiltersMenus(DBObject object){
-        for (DataSetFiltersMenu filterMenu : filters) {
+    protected void createFilters() {
+    }
+    protected boolean applyFiltersMenus(DBObject object) {
+        for (DataSetFiltersMenu filterMenu : filtersMenus) {
             if (!filterMenu.Validate(object))
                 return false;
         }
         return true;
     }
     public boolean ApplyFilters(DBObject object) {
-       //могут быть и другие фильтры ( например свои/активные). перенести их сюда и обобщить
-       return applyFiltersMenus(object);
+        //могут быть и другие фильтры ( например свои/активные). перенести их сюда и обобщить
+        return applyFiltersMenus(object);
     }
     @Override
     protected void redrawControl() {
@@ -303,10 +303,10 @@ public class DataSetControlForm extends ControlForm<DataTable> {
     }
     @Override
     public void Show() {
-        for (DataSetFiltersMenu filterMenu : filters) filterMenu.Drop();
+        for (DataSetFiltersMenu filterMenu : filtersMenus) filterMenu.Drop();
         super.Show();
         if (f_ui != null) f_ui.ShowMatchesCount(getRowCount());
-        for (DataSetFiltersMenu filterMenu : filters) filterMenu.Refresh();
+        for (DataSetFiltersMenu filterMenu : filtersMenus) filterMenu.Refresh();
     }
     public void Show(Object pk) {
         Show();
diff --git a/src/Common/Visual/DataSetFiltersMenu.java b/src/Common/Visual/DataSetFiltersMenu.java
index 20f878c6..e14f2a02 100644
--- a/src/Common/Visual/DataSetFiltersMenu.java
+++ b/src/Common/Visual/DataSetFiltersMenu.java
@@ -8,11 +8,10 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Vector;
 public abstract class DataSetFiltersMenu<D extends DBObject> {
-    VisualiserMenu menu= null;
-    public VisualiserMenu getMenu(){return menu;}
     //--
     protected DataSet<?, D> dataSet;
     protected Vector<DBObjectFilter<D>> field_filters;
+    VisualiserMenu menu = null;
     public DataSetFiltersMenu(String name, DataSet dataSet_in) {
         dataSet = dataSet_in;
         menu = new VisualiserMenu(name, "/Common/icons/Filter.png", true);
@@ -45,6 +44,9 @@ public abstract class DataSetFiltersMenu<D extends DBObject> {
             }
         });
     }
+    public VisualiserMenu getMenu() {
+        return menu;
+    }
     void selectAll(boolean flag) {
         for (DBObjectFilter filter : field_filters)
             filter.setActive(flag);
diff --git a/src/Common/Visual/Tables/ColumnFilter.java b/src/Common/Visual/Tables/HeaderTextFilter.java
similarity index 94%
rename from src/Common/Visual/Tables/ColumnFilter.java
rename to src/Common/Visual/Tables/HeaderTextFilter.java
index 337a0ecf..2e0b250a 100644
--- a/src/Common/Visual/Tables/ColumnFilter.java
+++ b/src/Common/Visual/Tables/HeaderTextFilter.java
@@ -10,10 +10,10 @@ import javax.swing.event.DocumentListener;
 import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-public class ColumnFilter {
+public class HeaderTextFilter {
     public JTextField textField;
     public JPopupMenu popup;
-    public ColumnFilter(DataSet dataSet, int columnIndex) {
+    public HeaderTextFilter(DataSet dataSet, int columnIndex) {
         textField = new StyledTextField() {
             {
                 setBorder(null);
@@ -61,7 +61,7 @@ public class ColumnFilter {
             public void mouseClicked(MouseEvent event) {
                 if (event.getClickCount() == 1) {
                     int columnIndex = dataSet.getUI().getControl().getTableHeader().columnAtPoint(event.getPoint());
-                    if (dataSet.columnsFilters.containsKey(columnIndex)) {
+                    if (dataSet.getUI().headersTextFilters.containsKey(columnIndex)) {
                         Rectangle columnRectangle = dataSet.getUI().getControl().getTableHeader().getHeaderRect(columnIndex);
                         Dimension d = new Dimension(columnRectangle.width - 72, columnRectangle.height - 1);
                         popup.setPreferredSize(d);
diff --git a/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java b/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java
index 65ab6cee..931189b5 100644
--- a/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java
+++ b/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java
@@ -22,7 +22,6 @@ public class DirInfosDataSet extends DataSet<String, DirInfo> {
             }
         };
     }
-
     @Override
     public Object getFieldAt(DirInfo object, int columnIndex) {
         switch (columnIndex) {
diff --git a/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java b/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
index 35db0a81..57962351 100644
--- a/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
+++ b/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
@@ -2,7 +2,7 @@ package _VisualDVM.ProjectData.Messages;
 import Common.Database.Tables.DataSet;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import Common.Visual.Tables.ColumnFilter;
+import Common.Visual.Tables.HeaderTextFilter;
 import Common.Visual.Tables.RendererWrapText;
 import _VisualDVM.Global;
 
@@ -46,7 +46,7 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
             @Override
             protected void createControl() {
                 super.createControl();
-                columnsFilters.put(3, new ColumnFilter(dataset, 3));
+                headersTextFilters.put(3, new HeaderTextFilter(dataset, 3));
                 control.setRowSorter(null);
                 TableRowSorter<TableModel> sorter = new TableRowSorter<>(control.getModel());
                 sorter.setSortable(3, false);
diff --git a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
index 9fed352f..d2b2b9be 100644
--- a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
+++ b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
@@ -98,7 +98,6 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
     public Comparator<BugReport> getComparator() {
         return (o1, o2) -> -(o1.getDate().compareTo(o2.getDate()));
     }
-
     @Override
     public Object getFieldAt(BugReport object, int columnIndex) {
         switch (columnIndex) {
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
index c9b50391..a1d97e6c 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
@@ -91,7 +91,7 @@ public class GroupsDBTable extends iDBTable<Group> {
             }
             @Override
             protected void createFilters() {
-                filters.add(new DataSetFiltersMenu<Group>("Тип", dataSource) {
+                filtersMenus.add(new DataSetFiltersMenu<Group>("Тип", dataSource) {
                     @Override
                     public void fill() {
                         for (TestType type : TestType.values())
@@ -103,7 +103,7 @@ public class GroupsDBTable extends iDBTable<Group> {
                             });
                     }
                 });
-                filters.add(new DataSetFiltersMenu<Group>("Язык", dataSource) {
+                filtersMenus.add(new DataSetFiltersMenu<Group>("Язык", dataSource) {
                     @Override
                     public void fill() {
                         for (LanguageName languageName : LanguageName.values()) {
@@ -119,7 +119,6 @@ public class GroupsDBTable extends iDBTable<Group> {
             }
         };
     }
-
     @Override
     public Object getFieldAt(Group object, int columnIndex) {
         switch (columnIndex) {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
index d1326285..a63db29d 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
@@ -63,7 +63,7 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
             }
             @Override
             protected void createFilters() {
-                filters.add(new DataSetFiltersMenu<DVMRunTask>("Компиляция", dataSource) {
+                filtersMenus.add(new DataSetFiltersMenu<DVMRunTask>("Компиляция", dataSource) {
                     @Override
                     public void fill() {
                         for (TaskState state : TaskState.values()) {
@@ -78,7 +78,7 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
                         }
                     }
                 });
-                filters.add(new DataSetFiltersMenu<DVMRunTask>("Запуск", dataSource) {
+                filtersMenus.add(new DataSetFiltersMenu<DVMRunTask>("Запуск", dataSource) {
                     @Override
                     public void fill() {
                         for (TaskState state : TaskState.values()) {