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 implements DBObjectFilter_< protected boolean active = true; //включен ли фильтр protected DataSet dataSet = null; ///источник данных String description; //описание фильтра - int count = 0; public FilterFlag(DataSet dataSet_in, AbstractButton control_in, boolean active_in) { dataSet = dataSet_in; active = active_in; @@ -49,13 +48,6 @@ public abstract class FilterFlag 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 extends FilterFlag { + int count = 0; public FilterMenuFlag(DataSet dataSet_in, AbstractButton control_in, boolean active_in) { super(dataSet_in, control_in, active_in); } @@ -19,4 +20,8 @@ public abstract class FilterMenuFlag extends FilterFlag { public void ShowMatchesCount() { control.setText(description + " " + Utils_.RBrackets(count)); } + @Override + public void DropMatchesCount() { + count = 0; + } }