From c3ce2fed96314e0af5199c79dc277bd61860a0ff Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 26 Oct 2024 14:42:31 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 36 ----------
 src/Common/Visual/DataSetControlForm.java     |  4 +-
 .../Messages/MessagesControlForm.java         |  2 +-
 .../UI/RecommendationsForm.java               |  2 +-
 .../Common/Group/UI/GroupsForm.java           | 70 +++++++++----------
 .../DVM/DVMPackage/UI/DVMPackagesForm.java    | 45 ++++++------
 .../DVM/DVMTasks/UI/DVMRunTasksForm.java      | 53 +++++++-------
 .../SapforPackage/UI/SapforPackagesForm.java  | 44 ++++++------
 8 files changed, 111 insertions(+), 145 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index daa9df1f..d3cf63a6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,49 +7,13 @@
   </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/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils_.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/ColumnInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/HeaderTextFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/HeaderTextFilter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/RendereEditableHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendereEditableHeader.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index 4094f13a..68f6daf5 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -120,8 +120,8 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
         }
         return res;
     }
-    protected void AddFilter(DBObjectFilter_<D> filter_in) {
-        allFilters.add(filter_in);
+    protected void AddFilters(DBObjectFilter_<D>... new_filters) {
+        Collections.addAll(allFilters, new_filters);
     }
     protected final void AddColumns(ColumnInfo<D>... new_columns) {
         Collections.addAll(columns, new_columns);
diff --git a/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java b/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
index 87fe1e66..76cc9e01 100644
--- a/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
+++ b/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
@@ -58,7 +58,7 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
     }
     @Override
     protected void createFilters() {
-        AddFilter(new HeaderTextFilter(dataSource, 3, 72));
+        AddFilters(new HeaderTextFilter(dataSource, 3, 72));
     }
     @Override
     protected Comparator<Message> getDefaultComparator() {
diff --git a/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java b/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java
index 8f8a9503..8ef8a34b 100644
--- a/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java
+++ b/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java
@@ -34,7 +34,7 @@ public class RecommendationsForm extends DataSetControlForm<MessageRecommendatio
     }
     @Override
     protected void createFilters() {
-        AddFilter(new HeaderTextFilter(dataSource, 1, 72));
+        AddFilters(new HeaderTextFilter(dataSource, 1, 72));
     }
     @Override
     protected boolean hasMenuBar() {
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
index e6dc2e1d..f3a65365 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
@@ -60,42 +60,42 @@ public class GroupsForm extends DataSetControlForm<Group> {
     }
     @Override
     protected void createFilters() {
-        AddFilter(new FilterFlag<Group>(dataSource, new MenuBarButton() {
-            {
-                setText("Свои");
-                setToolTipText("Отображать только группы тестов авторства пользователя");
-            }
-        }, false) {
-            @Override
-            protected boolean validate(Group object) {
-                return Global.mainModule.getAccount().email.equals(object.sender_address);
-            }
-        });
-        AddFilter(new DataSetFiltersMenu<Group>("Тип", dataSource) {
-            @Override
-            public void fill() {
-                for (TestType type : TestType.values())
-                    field_filters.add(new FilterMenuFlag<Group>(dataSource, new StableMenuItem(type.getDescription()), true) {
-                        @Override
-                        protected boolean validate(Group object) {
-                            return object.type.equals(type);
+        AddFilters(
+                new FilterFlag<Group>(dataSource, new MenuBarButton() {
+                    {
+                        setText("Свои");
+                        setToolTipText("Отображать только группы тестов авторства пользователя");
+                    }
+                }, false) {
+                    @Override
+                    protected boolean validate(Group object) {
+                        return Global.mainModule.getAccount().email.equals(object.sender_address);
+                    }
+                },
+                new DataSetFiltersMenu<Group>("Тип", dataSource) {
+                    @Override
+                    public void fill() {
+                        for (TestType type : TestType.values())
+                            field_filters.add(new FilterMenuFlag<Group>(dataSource, new StableMenuItem(type.getDescription()), true) {
+                                @Override
+                                protected boolean validate(Group object) {
+                                    return object.type.equals(type);
+                                }
+                            });
+                    }
+                }, new DataSetFiltersMenu<Group>("Язык", dataSource) {
+                    @Override
+                    public void fill() {
+                        for (LanguageName languageName : LanguageName.values()) {
+                            field_filters.add(new FilterMenuFlag<Group>(dataSource, new StableMenuItem(languageName.getDescription()), true) {
+                                @Override
+                                protected boolean validate(Group object) {
+                                    return object.language.equals(languageName);
+                                }
+                            });
                         }
-                    });
-            }
-        });
-        AddFilter(new DataSetFiltersMenu<Group>("Язык", dataSource) {
-            @Override
-            public void fill() {
-                for (LanguageName languageName : LanguageName.values()) {
-                    field_filters.add(new FilterMenuFlag<Group>(dataSource, new StableMenuItem(languageName.getDescription()), true) {
-                        @Override
-                        protected boolean validate(Group object) {
-                            return object.language.equals(languageName);
-                        }
-                    });
-                }
-            }
-        });
+                    }
+                });
     }
     @Override
     protected DBObjectDialog getDialog() {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
index 762e5ecc..709ad45c 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
@@ -140,28 +140,29 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
     }
     @Override
     protected void createFilters() {
-        AddFilter(new FilterFlag<DVMPackage>(dataSource, new MenuBarButton() {
-            {
-                setText("Свои");
-                setToolTipText("Отображать только пакеты тестов авторства пользователя");
-            }
-        }, false) {
-            @Override
-            protected boolean validate(DVMPackage object) {
-                return Global.mainModule.getAccount().email.equals(object.sender_address);
-            }
-        });
-        AddFilter(new FilterFlag<DVMPackage>(dataSource, new MenuBarButton() {
-            {
-                setText("Активные");
-                setToolTipText("Отображать только активные пакеты тестов");
-            }
-        }, false) {
-            @Override
-            protected boolean validate(DVMPackage object) {
-                return object.state.isActive();
-            }
-        });
+        AddFilters(
+                new FilterFlag<DVMPackage>(dataSource, new MenuBarButton() {
+                    {
+                        setText("Свои");
+                        setToolTipText("Отображать только пакеты тестов авторства пользователя");
+                    }
+                }, false) {
+                    @Override
+                    protected boolean validate(DVMPackage object) {
+                        return Global.mainModule.getAccount().email.equals(object.sender_address);
+                    }
+                },
+                new FilterFlag<DVMPackage>(dataSource, new MenuBarButton() {
+                    {
+                        setText("Активные");
+                        setToolTipText("Отображать только активные пакеты тестов");
+                    }
+                }, false) {
+                    @Override
+                    protected boolean validate(DVMPackage object) {
+                        return object.state.isActive();
+                    }
+                });
     }
     @Override
     protected Comparator<DVMPackage> getDefaultComparator() {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
index efb3e49d..f45e79c6 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
@@ -110,36 +110,37 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
     }
     @Override
     protected void createFilters() {
-        AddFilter(new DataSetFiltersMenu<DVMRunTask>("Компиляция", dataSource) {
-            @Override
-            public void fill() {
-                for (TaskState state : TaskState.values()) {
-                    if (state.isVisible()) {
-                        field_filters.add(new FilterMenuFlag<DVMRunTask>(dataSource, new StableMenuItem(state.getDescription()), true) {
-                            @Override
-                            protected boolean validate(DVMRunTask object) {
-                                return object.compilation_state.equals(state);
+        AddFilters(
+                new DataSetFiltersMenu<DVMRunTask>("Компиляция", dataSource) {
+                    @Override
+                    public void fill() {
+                        for (TaskState state : TaskState.values()) {
+                            if (state.isVisible()) {
+                                field_filters.add(new FilterMenuFlag<DVMRunTask>(dataSource, new StableMenuItem(state.getDescription()), true) {
+                                    @Override
+                                    protected boolean validate(DVMRunTask object) {
+                                        return object.compilation_state.equals(state);
+                                    }
+                                });
                             }
-                        });
+                        }
                     }
-                }
-            }
-        });
-        AddFilter(new DataSetFiltersMenu<DVMRunTask>("Запуск", dataSource) {
-            @Override
-            public void fill() {
-                for (TaskState state : TaskState.values()) {
-                    if (state.isVisible()) {
-                        field_filters.add(new FilterMenuFlag<DVMRunTask>(dataSource, new StableMenuItem(state.getDescription()), true) {
-                            @Override
-                            protected boolean validate(DVMRunTask object) {
-                                return object.state.equals(state);
+                },
+                new DataSetFiltersMenu<DVMRunTask>("Запуск", dataSource) {
+                    @Override
+                    public void fill() {
+                        for (TaskState state : TaskState.values()) {
+                            if (state.isVisible()) {
+                                field_filters.add(new FilterMenuFlag<DVMRunTask>(dataSource, new StableMenuItem(state.getDescription()), true) {
+                                    @Override
+                                    protected boolean validate(DVMRunTask object) {
+                                        return object.state.equals(state);
+                                    }
+                                });
                             }
-                        });
+                        }
                     }
-                }
-            }
-        });
+                });
     }
     @Override
     protected Comparator<DVMRunTask> getDefaultComparator() {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
index e73a80fe..afafd56c 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
@@ -122,27 +122,27 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
     }
     @Override
     protected void createFilters() {
-        AddFilter(new FilterFlag<SapforPackage>(dataSource, new MenuBarButton() {
-            {
-                setText("Свои");
-                setToolTipText("Отображать только пакеты тестов авторства пользователя");
-            }
-        }, false) {
-            @Override
-            protected boolean validate(SapforPackage object) {
-                return Global.mainModule.getAccount().email.equals(object.sender_address);
-            }
-        });
-        AddFilter(new FilterFlag<SapforPackage>(dataSource, new MenuBarButton() {
-            {
-                setText("Активные");
-                setToolTipText("Отображать только активные пакеты тестов");
-            }
-        }, false) {
-            @Override
-            protected boolean validate(SapforPackage object) {
-                return object.state.isActive();
-            }
-        });
+        AddFilters(new FilterFlag<SapforPackage>(dataSource, new MenuBarButton() {
+                       {
+                           setText("Свои");
+                           setToolTipText("Отображать только пакеты тестов авторства пользователя");
+                       }
+                   }, false) {
+                       @Override
+                       protected boolean validate(SapforPackage object) {
+                           return Global.mainModule.getAccount().email.equals(object.sender_address);
+                       }
+                   },
+                new FilterFlag<SapforPackage>(dataSource, new MenuBarButton() {
+                    {
+                        setText("Активные");
+                        setToolTipText("Отображать только активные пакеты тестов");
+                    }
+                }, false) {
+                    @Override
+                    protected boolean validate(SapforPackage object) {
+                        return object.state.isActive();
+                    }
+                });
     }
 }