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-14 15:19:13 +03:00
parent 8eef367bd4
commit 5e09fb44ea
634 changed files with 3751 additions and 3263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Common/Database/Tables/DataSet.java
View File

@@ -1,15 +1,15 @@
package Common.Database.Tables;
import Common.Current_;
import Common.Visual.DataSetFilter;
import Common.Database.Objects.DBObject;
import Common.Utils.TextLog;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFilter;
import Common.Visual.FilterInterface;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnFilter;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import Common.Utils.TextLog;
import Common.Database.Objects.DBObject;
import Common.Visual.UI_;
import Common.Visual.FilterInterface;
import _VisualDVM.Global;
import javax.swing.*;
@@ -28,29 +28,29 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public LinkedHashMap<K, D> Data = new LinkedHashMap<>(); //наполнение
//-
public DataSetControlForm ui_;
protected FilterInterface f_ui; // отображение количества объектов
//-
public LinkedHashMap<Integer, ColumnFilter> columnsFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
protected FilterInterface f_ui; // отображение количества объектов
//--
protected Vector<DataSetFilter<D>> filters = new Vector<>();
protected void createFilters() {
}
//--
public DataSet(Class<K> k_in, Class<D> d_in) {
k = k_in;
d = d_in;
Name = d.getSimpleName();
}
protected void createFilters() {
}
public void mountUI(JPanel content_in) {
UI_.Clear(content_in);
//-->
ui_ = createUI();
ui_.setContent(content_in);
//-->
if ( UI_.menuBars.containsKey(getClass())) {
DataMenuBar bar = UI_.menuBars.get(getClass());
if (UI_.menuBars.containsKey(getClass())) {
DataMenuBar bar = UI_.menuBars.get(getClass());
content_in.add(bar, BorderLayout.NORTH);
setFilterUI(count -> UI_.menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
setFilterUI(count -> UI_.menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
if (ui_.hasCheckBox())
bar.createSelectionButtons(this);
}
@@ -58,7 +58,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
//----
createFilters();
if (!filters.isEmpty()) {
DataMenuBar menuBar = UI_.menuBars.get(getClass());
DataMenuBar menuBar = UI_.menuBars.get(getClass());
for (DataSetFilter<D> filter : filters)
menuBar.addMenus(filter.menu);
}
@@ -264,7 +264,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
if (getCheckedCount() > 0)
res = getCheckedItems();
else {
if (CurrentName()!=null) {
if (CurrentName() != null) {
if (getCurrent() != null) {
res.add(getCurrent());
}