постепенное выведение старой концепции текущих объектов, касаемо табличных лучше держать их в интерфейсе таблиц, чтобы не писать описание объекта дважды и не мучиться с типом. некоторые фиксы

This commit is contained in:
2024-10-24 23:40:24 +03:00
parent f811d9b3ac
commit 36c11ac93f
153 changed files with 765 additions and 739 deletions

View File

@@ -3,6 +3,7 @@ import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
public class SapforSettingsCommandDialog extends DBObjectDialog<SapforSettingsCommand, SapforSettingsCommandFields> {
public SapforSettingsCommandDialog() {
@@ -19,6 +20,6 @@ public class SapforSettingsCommandDialog extends DBObjectDialog<SapforSettingsCo
@Override
public void ProcessResult() {
Result.passCode = (PassCode) fields.cbPassCode.getSelectedItem();
Result.sapforsettings_id = Global.mainModule.getSapforSettings().id;
Result.sapforsettings_id = Global.testingServer.db.getTable(SapforSettings.class).getUI().getCurrent().id;
}
}

View File

@@ -5,7 +5,9 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
import javax.swing.*;
@@ -14,8 +16,8 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
super(dataSource_in, mountPanel_in);
}
@Override
protected Current CurrentName() {
return Current.SapforSettingsCommand;
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
@@ -45,7 +47,8 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
}
@Override
public boolean isObjectVisible(SapforSettingsCommand object) {
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.SapforSettings, object.sapforsettings_id);
return super.isObjectVisible(object) &&
Global.testingServer.db.getTable(SapforSettings.class).getUI().matchCurrentID(object.sapforsettings_id);
}
@Override
protected DBObjectDialog getDialog() {