From 2712b904b181b66d15c120e1bca3be3c9e1c448b Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 29 Oct 2024 21:20:29 +0300
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B1=D1=8B=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B4=D1=81=D1=87=D0=B5=D1=82=20=D0=B2=20=D1=84=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8C=D1=82=D1=80=D0=B0=D1=85=20=D0=BD=D0=B0=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BB=D0=B8.=20=D0=B2=D1=81=D0=B5=20=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BD=D0=BE=20=D0=BE=D0=BD=D0=BE=20=D1=82=D0=B0=D0=BC=20?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B0?=
 =?UTF-8?q?=D0=B5=D1=82=D1=81=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Common/Visual/FilterFlag.java     | 10 +---------
 src/Common/Visual/FilterMenuFlag.java |  5 +++++
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Common/Visual/FilterFlag.java b/src/Common/Visual/FilterFlag.java
index 9290113e..e308b84c 100644
--- a/src/Common/Visual/FilterFlag.java
+++ b/src/Common/Visual/FilterFlag.java
@@ -12,7 +12,6 @@ public abstract class FilterFlag<D extends DBObject> implements DBObjectFilter_<
     protected boolean active = true; //включен ли фильтр
     protected DataSet<?, D> dataSet = null; ///источник данных
     String description; //описание фильтра
-    int count = 0;
     public FilterFlag(DataSet<?, D> dataSet_in, AbstractButton control_in, boolean active_in) {
         dataSet = dataSet_in;
         active = active_in;
@@ -49,13 +48,6 @@ public abstract class FilterFlag<D extends DBObject> implements DBObjectFilter_<
     protected abstract boolean validate(D object);
     @Override
     public boolean Validate(D object) {
-        boolean valid = validate(object);
-        if (valid)
-            count++;
-        return !active || valid;
-    }
-    @Override
-    public void DropMatchesCount() {
-        count = 0;
+        return !active || validate(object);
     }
 }
diff --git a/src/Common/Visual/FilterMenuFlag.java b/src/Common/Visual/FilterMenuFlag.java
index 00d972f0..a0f4924a 100644
--- a/src/Common/Visual/FilterMenuFlag.java
+++ b/src/Common/Visual/FilterMenuFlag.java
@@ -5,6 +5,7 @@ import Common.Utils.Utils_;
 
 import javax.swing.*;
 public abstract class FilterMenuFlag<D extends DBObject> extends FilterFlag<D> {
+    int count = 0;
     public FilterMenuFlag(DataSet<?, D> dataSet_in, AbstractButton control_in, boolean active_in) {
         super(dataSet_in, control_in, active_in);
     }
@@ -19,4 +20,8 @@ public abstract class FilterMenuFlag<D extends DBObject> extends FilterFlag<D> {
     public void ShowMatchesCount() {
         control.setText(description + " " + Utils_.RBrackets(count));
     }
+    @Override
+    public void DropMatchesCount() {
+        count = 0;
+    }
 }