M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
02090095
2024-10-24 23:40:24 +03:00
parent f811d9b3ac
commit 36c11ac93f
153 changed files with 765 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentValueDialog.java
View File

@@ -1,9 +1,12 @@
package _VisualDVM.GlobalData.EnvironmentValue.UI;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.Utils;
public class EnvironmentValueDialog extends DBObjectDialog<EnvironmentValue, EnvironmentValueFields> {
public EnvironmentValueDialog() {
@@ -40,8 +43,8 @@ public class EnvironmentValueDialog extends DBObjectDialog<EnvironmentValue, Env
}
@Override
public void ProcessResult() {
Result.machine_id = Global.mainModule.getMachine().id;
Result.run_configuration_id = Global.mainModule.getRunConfiguration().id;
Result.machine_id = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().id;
Result.run_configuration_id = MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().getCurrent().id;
Result.name = (String) fields.cbName.getSelectedItem();
Result.value = fields.tfValue.getText();
}

8
src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
View File

@@ -7,6 +7,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
@@ -15,8 +16,8 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
super(dataSource_in, mountPanel_in);
}
@Override
protected Current CurrentName() {
return Current.EnvironmentValue;
protected boolean needsCurrent() {
return true;
}
@Override
public String[] getUIColumnNames() {
@@ -48,7 +49,8 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
}
@Override
public boolean isObjectVisible(EnvironmentValue object) {
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id);
return super.isObjectVisible(object) &&
MainModule_.instance.getDb().matchCurrentID(RunConfiguration.class,object.run_configuration_id );
}
@Override
protected DBObjectDialog<EnvironmentValue, ? extends DialogFields> getDialog() {