рефакторинг контролов таблиц. убрал странный и запутанный старый код

This commit is contained in:
2024-10-17 20:04:16 +03:00
parent 01d366e256
commit 66fa638ec4
55 changed files with 241 additions and 212 deletions

View File

@@ -48,11 +48,10 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription());
}
public void mountUI(JPanel content_in) {
UI.Clear(content_in);
public void mountUI(JPanel mountPanel_in) {
UI.Clear(mountPanel_in);
//-->
ui_ = createUI();
ui_.setContent(content_in);
ui_ = createUI(mountPanel_in);
//-->
if (hasMenuBar()) {
try {
@@ -65,7 +64,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
} else {
bar = MainModule_.instance.getUI().menuBars.get(getClass());
}
content_in.add(bar, BorderLayout.NORTH);
mountPanel_in.add(bar, BorderLayout.NORTH);
//--
setFilterUI(count -> MainModule_.instance.getUI().menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
//--
@@ -73,7 +72,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
ex.printStackTrace();
}
}
content_in.add(ui_.getDataPanel(), BorderLayout.CENTER);
//----
createFilters();
if (!filters.isEmpty()) {
@@ -112,7 +110,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public String[] getUIColumnNames() {
return new String[]{};
}
protected DataSetControlForm createUI() {
protected DataSetControlForm createUI(JPanel mountPanel) {
return null;
}
public boolean hasUI() {