окончательное разделение таблицы и функционала видимой ее формы
This commit is contained in:
@@ -8,7 +8,6 @@ import Common.Passes.PassCode_;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.UI;
|
||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||
import _VisualDVM.Current;
|
||||
import _VisualDVM.GlobalData.Compiler.Compiler;
|
||||
import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
|
||||
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
|
||||
@@ -29,14 +28,6 @@ public class MachinesDBTable extends iDBTable<Machine> {
|
||||
super(Machine.class);
|
||||
}
|
||||
@Override
|
||||
public String getSingleDescription() {
|
||||
return "машина";
|
||||
}
|
||||
@Override
|
||||
public String getPluralDescription() {
|
||||
return "машины";
|
||||
}
|
||||
@Override
|
||||
public DBObjectDialog<Machine, MachineFields> getDialog() {
|
||||
return new DBObjectDialog<Machine, MachineFields>(MachineFields.class) {
|
||||
@Override
|
||||
@@ -88,10 +79,6 @@ public class MachinesDBTable extends iDBTable<Machine> {
|
||||
protected DataSetControlForm createUI(JPanel mountPanel) {
|
||||
return new MachinesForm(this, mountPanel);
|
||||
}
|
||||
@Override
|
||||
public Current CurrentName() {
|
||||
return Current.Machine;
|
||||
}
|
||||
public boolean LocalMachineExists() {
|
||||
return Data.values().stream().anyMatch(machine -> machine.type.equals(MachineType.Local));
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
|
||||
import Common.Visual.Controls.MenuBarButton;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.Menus.DataMenuBar;
|
||||
import _VisualDVM.Current;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.GlobalData.Machine.Machine;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
@@ -15,6 +16,18 @@ public class MachinesForm extends DataSetControlForm<Machine> {
|
||||
super(dataSource_in, mountPanel_in);
|
||||
}
|
||||
@Override
|
||||
public Current CurrentName() {
|
||||
return Current.Machine;
|
||||
}
|
||||
@Override
|
||||
public String getSingleDescription() {
|
||||
return "машина";
|
||||
}
|
||||
@Override
|
||||
public String getPluralDescription() {
|
||||
return "машины";
|
||||
}
|
||||
@Override
|
||||
public boolean hasCheckBox() {
|
||||
return true;
|
||||
}
|
||||
@@ -40,7 +53,7 @@ public class MachinesForm extends DataSetControlForm<Machine> {
|
||||
}
|
||||
@Override
|
||||
public DataMenuBar createMenuBar() {
|
||||
return new DataMenuBar(dataSource.getPluralDescription(),
|
||||
return new DataMenuBar(getPluralDescription(),
|
||||
PassCode.AddMachine,
|
||||
PassCode.EditMachine,
|
||||
PassCode.DeleteMachine) {
|
||||
|
||||
Reference in New Issue
Block a user