убрал избыточный подсчет в фильтрах на панели. все равно оно там неотображается

This commit is contained in:
2024-10-29 21:20:29 +03:00
parent c78c5d464d
commit 2712b904b1
2 changed files with 6 additions and 9 deletions

View File

@@ -12,7 +12,6 @@ public abstract class FilterFlag<D extends DBObject> implements DBObjectFilter_<
protected boolean active = true; //включен ли фильтр protected boolean active = true; //включен ли фильтр
protected DataSet<?, D> dataSet = null; ///источник данных protected DataSet<?, D> dataSet = null; ///источник данных
String description; //описание фильтра String description; //описание фильтра
int count = 0;
public FilterFlag(DataSet<?, D> dataSet_in, AbstractButton control_in, boolean active_in) { public FilterFlag(DataSet<?, D> dataSet_in, AbstractButton control_in, boolean active_in) {
dataSet = dataSet_in; dataSet = dataSet_in;
active = active_in; active = active_in;
@@ -49,13 +48,6 @@ public abstract class FilterFlag<D extends DBObject> implements DBObjectFilter_<
protected abstract boolean validate(D object); protected abstract boolean validate(D object);
@Override @Override
public boolean Validate(D object) { public boolean Validate(D object) {
boolean valid = validate(object); return !active || validate(object);
if (valid)
count++;
return !active || valid;
}
@Override
public void DropMatchesCount() {
count = 0;
} }
} }

View File

@@ -5,6 +5,7 @@ import Common.Utils.Utils_;
import javax.swing.*; import javax.swing.*;
public abstract class FilterMenuFlag<D extends DBObject> extends FilterFlag<D> { 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) { public FilterMenuFlag(DataSet<?, D> dataSet_in, AbstractButton control_in, boolean active_in) {
super(dataSet_in, control_in, 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() { public void ShowMatchesCount() {
control.setText(description + " " + Utils_.RBrackets(count)); control.setText(description + " " + Utils_.RBrackets(count));
} }
@Override
public void DropMatchesCount() {
count = 0;
}
} }