M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2024-10-22 13:00:11 +03:00
parent 348b7602ff
commit b696af952f
14 changed files with 47 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Common/Visual/DataSetControlForm.java
View File

@@ -7,7 +7,6 @@ import Common.Database.Tables.DataSet;
import Common.Database.Tables.FKBehaviour;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Menus.TableMenu;
import Common.Visual.Tables.*;
@@ -34,19 +33,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении
//-
protected Vector<DBObjectFilter_<D>> allFilters = new Vector<>();
<M> Vector<M> getFilters(Class<M> f){
Vector<M> res = new Vector<>();
for (DBObjectFilter_ filter_: allFilters){
//либо М, либо наследует от М
if (filter_.getClass().equals(f)||filter_.getClass().getSuperclass().equals(f)){
res.add((M) filter_);
}
}
return res;
}
public void AddFilter(DBObjectFilter_<D> filter_in){
allFilters.add(filter_in);
}
//---
//фильтры и подсчеты. todo слить с баром (?)
MatchesCounter counter_ui = null;
@@ -85,7 +71,20 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
ex.printStackTrace();
}
}
System.out.println("found "+allFilters.size()+" filters for ui "+this.getClass().getSimpleName());
System.out.println("found " + allFilters.size() + " filters for ui " + this.getClass().getSimpleName());
}
<M> Vector<M> getFilters(Class<M> f) {
Vector<M> res = new Vector<>();
for (DBObjectFilter_ filter_ : allFilters) {
//либо М, либо наследует от М
if (filter_.getClass().equals(f) || filter_.getClass().getSuperclass().equals(f)) {
res.add((M) filter_);
}
}
return res;
}
public void AddFilter(DBObjectFilter_<D> filter_in) {
allFilters.add(filter_in);
}
public ColumnInfo getColumnInfo(int i) {
return columns.get(i);
@@ -347,7 +346,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected void createFilters() {
}
protected boolean ApplyFilters(D object) {
for (DBObjectFilter_ filterInterface: allFilters){
for (DBObjectFilter_ filterInterface : allFilters) {
if (!filterInterface.Validate(object)) //??
return false;
}