From 05ec4871a14ce5c4143af5f3e7bb0d92447764a2 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 26 Dec 2023 16:18:23 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  5 +-
 .../{TableFilter.java => DBObjectFilter.java} | 46 ++++++++++---------
 src/Common/Database/DataSetFilter.java        | 10 ++++
 .../Common/Group/GroupsDBTable.java           | 30 ++++++------
 .../DVM/DVMTasks/DVMRunTasksSet.java          | 30 ++++++------
 5 files changed, 69 insertions(+), 52 deletions(-)
 rename src/Common/Database/{TableFilter.java => DBObjectFilter.java} (65%)
 create mode 100644 src/Common/Database/DataSetFilter.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 92cde530..823c8328 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/Common/Database/DataSetFilter.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/TableFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/DBObjectFilter.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Database/TableFilter.java b/src/Common/Database/DBObjectFilter.java
similarity index 65%
rename from src/Common/Database/TableFilter.java
rename to src/Common/Database/DBObjectFilter.java
index b5e90f88..a133d1ea 100644
--- a/src/Common/Database/TableFilter.java
+++ b/src/Common/Database/DBObjectFilter.java
@@ -3,15 +3,24 @@ import Common.UI.Menus_2023.StableMenuItem;
 import Common.Utils.Utils;
 
 import javax.swing.*;
-public class TableFilter<D extends DBObject> {
-    DataSet table;
-    public JMenuItem menuItem;   //пункт меню фильтра. ( возможно потом сделать и кнопку)
+//одиночный фильтр, пункт фильтрационного меню.
+public abstract class DBObjectFilter<D extends DBObject> {
     String description;
-    public boolean active = true; //включен ли фильтр
-    public int count = 0;
-    protected boolean validate(D object) {
-        return true;
+    boolean active = true; //включен ли фильтр
+    int count = 0;
+    //--
+    public JMenuItem menuItem;   //пункт меню фильтра. ( возможно потом сделать и кнопку)
+    //--
+    static String getNotActiveIconPath() {
+        return "/icons/NotPick.png";
     }
+    static String getActiveIconPath() {
+        return "/icons/Pick.png";
+    }
+    void Mark() {
+        menuItem.setIcon(Utils.getIcon(active ? getActiveIconPath() : getNotActiveIconPath()));
+    }
+    //-------
     public boolean Validate(D object) {
         if (active) {
             boolean valid = validate(object);
@@ -21,16 +30,12 @@ public class TableFilter<D extends DBObject> {
         }
         return false;
     }
-    static String getNotActiveIconPath() {
-        return "/icons/NotPick.png";
+    public void ResetCount() {
+        count = 0;
     }
-    static String getActiveIconPath() {
-        return "/icons/Pick.png";
-    }
-    public TableFilter(DataSet table_in, String description_in, boolean active_in) {
-        table = table_in;
-        menuItem = new StableMenuItem((description = description_in)+" (0)");
-        active=active_in;
+    public DBObjectFilter(DataSet table, String description_in, boolean active_in) {
+        menuItem = new StableMenuItem((description = description_in) + " (0)");
+        active = active_in;
         menuItem.addActionListener(e -> {
             active = !active;
             Mark();
@@ -38,13 +43,12 @@ public class TableFilter<D extends DBObject> {
         });
         Mark();
     }
-    public TableFilter(DataSet table_in, String description_in){
-        this(table_in,description_in,true);
-    }
-    public void Mark() {
-        menuItem.setIcon(Utils.getIcon(active ? getActiveIconPath() : getNotActiveIconPath()));
+    public DBObjectFilter(DataSet table_in, String description_in) {
+        this(table_in, description_in, true);
     }
     public void ShowDescriptionAndCount() {
         menuItem.setText(description + " " + Utils.RBrackets(count));
     }
+    //--
+    protected abstract boolean validate(D object);
 }
diff --git a/src/Common/Database/DataSetFilter.java b/src/Common/Database/DataSetFilter.java
new file mode 100644
index 00000000..6429678c
--- /dev/null
+++ b/src/Common/Database/DataSetFilter.java
@@ -0,0 +1,10 @@
+package Common.Database;
+import TestingSystem.Common.Group.Group;
+
+import java.util.Vector;
+public class DataSetFilter {
+    public Vector<DBObjectFilter<Group>> filters;
+    public DataSetFilter(String name){
+
+    }
+}
diff --git a/src/TestingSystem/Common/Group/GroupsDBTable.java b/src/TestingSystem/Common/Group/GroupsDBTable.java
index 3c171fa9..b33b5e71 100644
--- a/src/TestingSystem/Common/Group/GroupsDBTable.java
+++ b/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() {
diff --git a/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java b/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
index ebb0363a..aa4b73d4 100644
--- a/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
+++ b/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
@@ -1,7 +1,7 @@
 package TestingSystem.DVM.DVMTasks;
 import Common.Current;
 import Common.Database.DataSet;
-import Common.Database.TableFilter;
+import Common.Database.DBObjectFilter;
 import Common.UI.DataSetControlForm;
 import Common.UI.Menus_2023.VisualiserMenu;
 import Common.UI.UI;
@@ -15,8 +15,8 @@ import static Common.UI.Tables.TableRenderers.RendererProgress;
 import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
 public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
     //todo обобщить бы наличие фильтров для всех таблиц.
-    public Vector<TableFilter<DVMRunTask>> compilationFilters;
-    public Vector<TableFilter<DVMRunTask>> runFilters;
+    public Vector<DBObjectFilter<DVMRunTask>> compilationFilters;
+    public Vector<DBObjectFilter<DVMRunTask>> runFilters;
     DVMPackage target;
     public DVMRunTasksSet() {
         super(Integer.class, DVMRunTask.class);
@@ -27,7 +27,7 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
             //--
             for (TaskState state : TaskState.values()) {
                 if (state.isVisible()) {
-                    compilationFilters.add(new TableFilter<DVMRunTask>(this, state.getDescription()) {
+                    compilationFilters.add(new DBObjectFilter<DVMRunTask>(this, state.getDescription()) {
                         @Override
                         protected boolean validate(DVMRunTask object) {
                             return object.compilation_state.equals(state);
@@ -38,7 +38,7 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
             //--
             for (TaskState state : TaskState.values()) {
                 if (state.isVisible()) {
-                    runFilters.add(new TableFilter<DVMRunTask>(this, state.getDescription()) {
+                    runFilters.add(new DBObjectFilter<DVMRunTask>(this, state.getDescription()) {
                         @Override
                         protected boolean validate(DVMRunTask object) {
                             return object.state.equals(state);
@@ -49,29 +49,29 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
         }
     }
     public void ResetFiltersCount() {
-        for (TableFilter<DVMRunTask> filter : compilationFilters)
-            filter.count = 0;
-        for (TableFilter<DVMRunTask> filter : runFilters)
-            filter.count = 0;
+        for (DBObjectFilter<DVMRunTask> filter : compilationFilters)
+            filter.ResetCount();
+        for (DBObjectFilter<DVMRunTask> filter : runFilters)
+            filter.ResetCount();
     }
     public void ShowFiltersCount() {
-        for (TableFilter<DVMRunTask> filter : compilationFilters) {
+        for (DBObjectFilter<DVMRunTask> filter : compilationFilters) {
             filter.ShowDescriptionAndCount();
         }
-        for (TableFilter<DVMRunTask> filter : runFilters) {
+        for (DBObjectFilter<DVMRunTask> filter : runFilters) {
             filter.ShowDescriptionAndCount();
         }
     }
     public boolean applyFilters(DVMRunTask object) {
         boolean compilation = false;
         //возвращать сразу нельзя. иначе количество не посчитает.
-        for (TableFilter filter : compilationFilters) {
+        for (DBObjectFilter filter : compilationFilters) {
             if (filter.Validate(object)) {
                 compilation |= true;
             }
         }
         boolean run = false;
-        for (TableFilter filter : runFilters) {
+        for (DBObjectFilter filter : runFilters) {
             if (filter.Validate(object)) {
                 run |= true;
             }
@@ -88,13 +88,13 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
         menuBar.addFilters(
                 new VisualiserMenu("Компиляция", "/icons/Filter.png", true) {
                     {
-                        for (TableFilter filter : compilationFilters)
+                        for (DBObjectFilter filter : compilationFilters)
                             add(filter.menuItem);
                     }
                 },
                 new VisualiserMenu("Запуск", "/icons/Filter.png", true) {
                     {
-                        for (TableFilter filter : runFilters)
+                        for (DBObjectFilter filter : runFilters)
                             add(filter.menuItem);
                     }
                 }