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

3
src/_VisualDVM/GlobalData/Compiler/UI/CompilerDialog.java
View File

@@ -5,6 +5,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.Utils;
import _VisualDVM.Validators.PathValidator;
public class CompilerDialog extends DBObjectDialog<Compiler, CompilerFields> {
@@ -75,7 +76,7 @@ public class CompilerDialog extends DBObjectDialog<Compiler, CompilerFields> {
}
@Override
public void ProcessResult() {
Result.machine_id = Global.mainModule.getMachine().id;
Result.machine_id = Global.mainModule.getDb().getTable(Machine.class).getUI().getCurrent().id;
Result.description = fields.tfDescription.getText();
Result.call_command = fields.tfCallCommand.getText();
Result.help_command = fields.tfHelpCommand.getText();

3
src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java
View File

@@ -5,6 +5,7 @@ import Common.Visual.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.VDirectoryChooser;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.Passes.PassCode;
@@ -30,7 +31,7 @@ public class CompilerFields implements DialogFields {
CompilerType type = (CompilerType) cbCompilerType.getSelectedItem();
if (type == CompilerType.dvm) {
String dst = null;
if (Global.mainModule.getMachine().type.equals(MachineType.Local)) {
if (Global.mainModule.getDb().getTable(Machine.class).getUI().getCurrent().type.equals(MachineType.Local)) {
File file = directoryChooser.ShowDialog();
if (file != null)
dst = file.getAbsolutePath();

8
src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
View File

@@ -7,6 +7,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
@@ -15,8 +16,8 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
super(dataSource_in, mountPanel_in);
}
@Override
protected Current CurrentName() {
return Current.Compiler;
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
@@ -68,7 +69,8 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
}
@Override
public boolean isObjectVisible(Compiler object) {
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
return super.isObjectVisible(object) &&
Global.mainModule.getDb().getTable(Machine.class).getUI().matchCurrentID(object.machine_id);
}
@Override
protected DBObjectDialog getDialog() {