no message
This commit is contained in:
@@ -32,7 +32,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
|
||||
protected boolean events_on = true;
|
||||
protected String colNamesAndSizes = "";
|
||||
protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении
|
||||
protected Vector<DataSetFiltersMenu> filtersMenus = new Vector<>();
|
||||
protected Vector<DataSetFiltersMenu> filtersMenus = new Vector<>(); //выпадающие меню фильтрации
|
||||
protected LinkedHashMap<Integer, HeaderTextFilter> headersTextFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
|
||||
//фильтры и подсчеты. todo слить с баром (?)
|
||||
MatchesCounter f_ui = null;
|
||||
@@ -112,24 +112,28 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
|
||||
protected void AdditionalInitColumns() {
|
||||
//уточнение инфы по столбцам.
|
||||
}
|
||||
public Comparator getDefaultComparator() {
|
||||
return null;
|
||||
}
|
||||
Vector<Object> getVisibleKeys() {
|
||||
Comparator comparator = dataSource.getComparator();
|
||||
Vector<Object> res = new Vector<>();
|
||||
Comparator comparator = getDefaultComparator();
|
||||
Vector<Object> res_keys = new Vector<>();
|
||||
if (comparator == null) {
|
||||
for (Object key : dataSource.Data.keySet())
|
||||
if (dataSource.get(key).isVisible())
|
||||
res.add(key);
|
||||
res_keys.add(key);
|
||||
} else {
|
||||
Vector<Object> raw = new Vector<>();
|
||||
Vector<D> raw = new Vector<>();
|
||||
for (Object object : dataSource.Data.values()) {
|
||||
if (((DBObject) object).isVisible())
|
||||
raw.add(object);
|
||||
D object1 = (D) object;
|
||||
if (object1.isVisible())
|
||||
raw.add(object1);
|
||||
}
|
||||
raw.sort(comparator);
|
||||
for (Object object : raw)
|
||||
res.add(((DBObject) object).getPK());
|
||||
for (D object : raw)
|
||||
res_keys.add(object.getPK());
|
||||
}
|
||||
return res;
|
||||
return res_keys;
|
||||
}
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user