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 20:17:29 +03:00
parent bdbd49fa6d
commit 84acf05c19
50 changed files with 303 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package Common.Database.Tables;
import Common.Current_;
import Common.Database.Objects.DBObject;
import Common.MainModule_;
import Common.Utils.TextLog;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFilter;
@@ -47,10 +48,10 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
ui_ = createUI();
ui_.setContent(content_in);
//-->
if (UI_.menuBars.containsKey(getClass())) {
DataMenuBar bar = UI_.menuBars.get(getClass());
if (MainModule_.instance.getUI().menuBars.containsKey(getClass())) {
DataMenuBar bar = MainModule_.instance.getUI().menuBars.get(getClass());
content_in.add(bar, BorderLayout.NORTH);
setFilterUI(count -> UI_.menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
setFilterUI(count -> MainModule_.instance.getUI().menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
if (ui_.hasCheckBox())
bar.createSelectionButtons(this);
}
@@ -58,7 +59,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
//----
createFilters();
if (!filters.isEmpty()) {
DataMenuBar menuBar = UI_.menuBars.get(getClass());
DataMenuBar menuBar = MainModule_.instance.getUI().menuBars.get(getClass());
for (DataSetFilter<D> filter : filters)
menuBar.addMenus(filter.menu);
}