приведение фильтров к объекту интерфейса таблицы

.idea/workspace.xml

@@ -9,49 +9,13 @@
     <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/Common/Visual/DataSetFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetFiltersMenu.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/Common/Visual/FilterInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/MatchesCounter.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/TestingSystem/Common/Group/Group.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/Group.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.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/DVMTasks/DVMRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.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

@@ -5,8 +5,7 @@ import Common.MainModule_;
 import Common.Passes.PassCode_;
 import Common.Utils.TextLog;
 import Common.Visual.DataSetControlForm;
-import Common.Visual.DataSetFilter;
+import Common.Visual.DataSetFiltersMenu;
-import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnFilter;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
@@ -30,8 +29,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
     //-
     protected DataSetControlForm ui = null;
     //--
-    protected Vector<DataSetFilter<D>> filters = new Vector<>();
-    //--
     public DataSet(Class<K> k_in, Class<D> d_in) {
         k = k_in;
         d = d_in;
@@ -45,12 +42,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
     public void mountUI(JPanel mountPanel_in) {
         UI.Clear(mountPanel_in);
         ui = createUI(mountPanel_in);
-        createFilters();
-        if (!filters.isEmpty()) {
-            DataMenuBar menuBar = MainModule_.instance.getUI().menuBars.get(getClass());
-            for (DataSetFilter<D> filter : filters)
-                menuBar.addMenus(filter.menu);
-        }
     }
     public void ClearUI() {
         if ((ui != null) && ui.isShown()) {
@@ -192,33 +183,14 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
     }
     //--
     public void ShowUI() {
-        for (DataSetFilter<D> filter : filters)
-            filter.Drop();
-        //--
         if (ui != null) {
             ui.Show();
         }
-        //--
-        for (DataSetFilter<D> filter : filters)
-            filter.Refresh();
     }
     public void ShowUI(Object key) {
-        for (DataSetFilter<D> filter : filters)
-            filter.Drop();
-        //--
         if (ui != null) {
             ui.Show(key);
         }
-        //--
-        for (DataSetFilter<D> filter : filters)
-            filter.Refresh();
-    }
-    public boolean applyFilters(D object) {
-        for (DataSetFilter<D> filter : filters) {
-            if (!filter.Validate(object))
-                return false;
-        }
-        return true;
     }
     //------------------------------------------------------------------------------------
     public Current_ CurrentName() {

src/Common/Visual/DataSetControlForm.java

@@ -33,7 +33,9 @@ public class DataSetControlForm extends ControlForm<DataTable> {
     protected boolean events_on = true;
     protected String colNamesAndSizes = "";
     protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении
-    FilterInterface f_ui; // отображение количества объектов ( todo слить с баром ?)
+    //фильтры и подсчеты. 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;
@@ -52,6 +54,11 @@ public class DataSetControlForm extends ControlForm<DataTable> {
                 //--
                 f_ui = (count -> bar.countLabel.setText(String.valueOf(count)));
                 //--
+                createFilters();
+                if (!filters.isEmpty()) {
+                    for (DataSetFiltersMenu filter : filters)
+                        bar.addMenus(filter.getMenu());
+                }
             } catch (Exception ex) {
                 ex.printStackTrace();
             }
@@ -275,14 +282,28 @@ 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) {
+            if (!filterMenu.Validate(object))
+                return false;
+        }
+        return true;
+    }
+    public boolean ApplyFilters(DBObject object) {
+       //могут быть и другие фильтры ( например свои/активные). перенести их сюда и обобщить
+       return applyFiltersMenus(object);
+    }
     @Override
     protected void redrawControl() {
         control.CorrectSizes();
     }
     @Override
     public void Show() {
+        for (DataSetFiltersMenu filterMenu : filters) filterMenu.Drop();
         super.Show();
         if (f_ui != null) f_ui.ShowMatchesCount(getRowCount());
+        for (DataSetFiltersMenu filterMenu : filters) filterMenu.Refresh();
     }
     public void Show(Object pk) {
         Show();

src/Common/Visual/DataSetFiltersMenu.java

@@ -7,12 +7,13 @@ import Common.Visual.Menus.VisualiserMenu;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Vector;
-public abstract class DataSetFilter<D extends DBObject> {
+public abstract class DataSetFiltersMenu<D extends DBObject> {
-    public VisualiserMenu menu;
+    VisualiserMenu menu= null;
+    public VisualiserMenu getMenu(){return menu;}
     //--
     protected DataSet<?, D> dataSet;
     protected Vector<DBObjectFilter<D>> field_filters;
-    public DataSetFilter(String name, DataSet dataSet_in) {
+    public DataSetFiltersMenu(String name, DataSet dataSet_in) {
         dataSet = dataSet_in;
         menu = new VisualiserMenu(name, "/Common/icons/Filter.png", true);
         field_filters = new Vector<>();

src/Common/Visual/MatchesCounter.java

@@ -1,5 +1,5 @@
 package Common.Visual;
-public interface FilterInterface {
+public interface MatchesCounter {
     void ShowMatchesCount(int count);
     default void ShowNoMatches() {
         ShowMatchesCount(0);

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

@@ -72,7 +72,7 @@ public class Group extends riDBObject {
     @Override
     public boolean isVisible() {
         return (!GroupsDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(sender_address)) &&
-                Global.testingServer.db.groups.applyFilters(this);
+                Global.testingServer.db.groups.getUI().ApplyFilters(this);
     }
     public String getSummary() {
         return description + " " + language.getDescription();

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

@@ -9,7 +9,7 @@ import Common.Utils.Utils_;
 import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.DBObjectFilter;
 import Common.Visual.DataSetControlForm;
-import Common.Visual.DataSetFilter;
+import Common.Visual.DataSetFiltersMenu;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
@@ -33,34 +33,6 @@ public class GroupsDBTable extends iDBTable<Group> {
     }
     //------------------------------------------------>>>
     @Override
-    protected void createFilters() {
-        filters.add(new Common.Visual.DataSetFilter<Group>("Тип", this) {
-            @Override
-            public void fill() {
-                for (TestType type : TestType.values())
-                    field_filters.add(new Common.Visual.DBObjectFilter<Group>(dataSet, type.getDescription()) {
-                        @Override
-                        protected boolean validate(Group object) {
-                            return object.type.equals(type);
-                        }
-                    });
-            }
-        });
-        filters.add(new DataSetFilter<Group>("Язык", this) {
-            @Override
-            public void fill() {
-                for (LanguageName languageName : LanguageName.values()) {
-                    field_filters.add(new DBObjectFilter<Group>(dataSet, languageName.getDescription()) {
-                        @Override
-                        protected boolean validate(Group object) {
-                            return object.language.equals(languageName);
-                        }
-                    });
-                }
-            }
-        });
-    }
-    @Override
     public String getSingleDescription() {
         return "группа тестов";
     }
@@ -108,6 +80,34 @@ public class GroupsDBTable extends iDBTable<Group> {
                     }
                 };
             }
+            @Override
+            protected void createFilters() {
+                filters.add(new DataSetFiltersMenu<Group>("Тип", dataSource) {
+                    @Override
+                    public void fill() {
+                        for (TestType type : TestType.values())
+                            field_filters.add(new Common.Visual.DBObjectFilter<Group>(dataSet, type.getDescription()) {
+                                @Override
+                                protected boolean validate(Group object) {
+                                    return object.type.equals(type);
+                                }
+                            });
+                    }
+                });
+                filters.add(new DataSetFiltersMenu<Group>("Язык", dataSource) {
+                    @Override
+                    public void fill() {
+                        for (LanguageName languageName : LanguageName.values()) {
+                            field_filters.add(new DBObjectFilter<Group>(dataSet, languageName.getDescription()) {
+                                @Override
+                                protected boolean validate(Group object) {
+                                    return object.language.equals(languageName);
+                                }
+                            });
+                        }
+                    }
+                });
+            }
         };
     }
     @Override

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

@@ -113,7 +113,7 @@ public class DVMRunTask extends DVMTask {
     }
     @Override
     public boolean isVisible() {
-        return Global.testingServer.db.dvmRunTasks.applyFilters(this);
+        return Global.testingServer.db.dvmRunTasks.getUI().ApplyFilters(this);
     }
     public File getCompilationTaskWorkspace() {
         return Paths.get(

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

@@ -2,7 +2,7 @@ package _VisualDVM.TestingSystem.DVM.DVMTasks;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DBObjectFilter;
 import Common.Visual.DataSetControlForm;
-import Common.Visual.DataSetFilter;
+import Common.Visual.DataSetFiltersMenu;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererProgressBar;
 import Common.Visual.Tables.RendererStatusEnum;
@@ -20,39 +20,6 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
         super(Integer.class, DVMRunTask.class);
     }
     @Override
-    protected void createFilters() {
-        filters.add(new DataSetFilter<DVMRunTask>("Компиляция", this) {
-            @Override
-            public void fill() {
-                for (TaskState state : TaskState.values()) {
-                    if (state.isVisible()) {
-                        field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
-                            @Override
-                            protected boolean validate(DVMRunTask object) {
-                                return object.compilation_state.equals(state);
-                            }
-                        });
-                    }
-                }
-            }
-        });
-        filters.add(new DataSetFilter<DVMRunTask>("Запуск", this) {
-            @Override
-            public void fill() {
-                for (TaskState state : TaskState.values()) {
-                    if (state.isVisible()) {
-                        field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
-                            @Override
-                            protected boolean validate(DVMRunTask object) {
-                                return object.state.equals(state);
-                            }
-                        });
-                    }
-                }
-            }
-        });
-    }
-    @Override
     public String getSingleDescription() {
         return "задача";
     }
@@ -77,6 +44,39 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
             public DataMenuBar createMenuBar() {
                 return new DataMenuBar(getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
             }
+            @Override
+            protected void createFilters() {
+                filters.add(new DataSetFiltersMenu<DVMRunTask>("Компиляция", dataSource) {
+                    @Override
+                    public void fill() {
+                        for (TaskState state : TaskState.values()) {
+                            if (state.isVisible()) {
+                                field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
+                                    @Override
+                                    protected boolean validate(DVMRunTask object) {
+                                        return object.compilation_state.equals(state);
+                                    }
+                                });
+                            }
+                        }
+                    }
+                });
+                filters.add(new DataSetFiltersMenu<DVMRunTask>("Запуск", dataSource) {
+                    @Override
+                    public void fill() {
+                        for (TaskState state : TaskState.values()) {
+                            if (state.isVisible()) {
+                                field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
+                                    @Override
+                                    protected boolean validate(DVMRunTask object) {
+                                        return object.state.equals(state);
+                                    }
+                                });
+                            }
+                        }
+                    }
+                });
+            }
         };
     }
     @Override