no message

src/TestingSystem/Common/Group/GroupsDBTable.java

@@ -16,8 +16,8 @@ import java.util.Vector;
 //-
 public class GroupsDBTable extends iDBTable<Group> {
     public static boolean filterMyOnly = false;
-    public Vector<TableFilter<Group>> typeFilters;
-    public Vector<TableFilter<Group>> languageFilters;
+    public Vector<DBObjectFilter<Group>> typeFilters;
+    public Vector<DBObjectFilter<Group>> languageFilters;
     //------------------------------------------------>>>
     public GroupsDBTable() {
         super(Group.class);
@@ -28,7 +28,7 @@ public class GroupsDBTable extends iDBTable<Group> {
             //--
             for (TestType type : TestType.values()) {
                 typeFilters.add(
-                        new TableFilter<Group>(this, type.getDescription()) {
+                        new DBObjectFilter<Group>(this, type.getDescription()) {
                             @Override
                             protected boolean validate(Group object) {
                                 return object.type.equals(type);
@@ -37,7 +37,7 @@ public class GroupsDBTable extends iDBTable<Group> {
             }
             //--
             for (LanguageName languageName : LanguageName.values()) {
-                languageFilters.add(new TableFilter<Group>(this, languageName.getDescription()) {
+                languageFilters.add(new DBObjectFilter<Group>(this, languageName.getDescription()) {
                     @Override
                     protected boolean validate(Group object) {
                         return object.language.equals(languageName);
@@ -56,45 +56,45 @@ public class GroupsDBTable extends iDBTable<Group> {
         menuBar.addFilters(
                 new VisualiserMenu("Тип", "/icons/Filter.png", true) {
                     {
-                        for (TableFilter filter : typeFilters)
+                        for (DBObjectFilter filter : typeFilters)
                             add(filter.menuItem);
                     }
                 },
                 new VisualiserMenu("Язык", "/icons/Filter.png", true) {
                     {
-                        for (TableFilter filter : languageFilters)
+                        for (DBObjectFilter filter : languageFilters)
                             add(filter.menuItem);
                     }
                 }
         );
     }
     public void ResetFiltersCount() {
-        for (TableFilter filter : typeFilters)
-            filter.count = 0;
-        for (TableFilter filter : languageFilters)
-            filter.count = 0;
+        for (DBObjectFilter filter : typeFilters)
+            filter.ResetCount();
+        for (DBObjectFilter filter : languageFilters)
+            filter.ResetCount();
     }
     public void ShowFiltersCount() {
-        for (TableFilter filter : typeFilters)
+        for (DBObjectFilter filter : typeFilters)
             filter.ShowDescriptionAndCount();
-        for (TableFilter filter : languageFilters)
+        for (DBObjectFilter filter : languageFilters)
             filter.ShowDescriptionAndCount();
     }
     public boolean applyFilters(Group object) {
         boolean type = false;
         //возвращать сразу нельзя. иначе количество не посчитает.
-        for (TableFilter filter : typeFilters) {
+        for (DBObjectFilter filter : typeFilters) {
             if (filter.Validate(object)) {
                 type |= true;
             }
         }
         boolean language = false;
-        for (TableFilter filter : languageFilters) {
+        for (DBObjectFilter filter : languageFilters) {
             if (filter.Validate(object)) {
                 language |= true;
             }
         }
-        return type&&language;
+        return type && language;
     }
     @Override
     public void ShowUI() {