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

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.Menus.DataMenuBar;
+import Common.Visual.DataSetFiltersMenu;
 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() {