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-22 15:25:06 +03:00
parent 319e6575c8
commit 38b2896e4a
102 changed files with 738 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/_VisualDVM/GlobalData/Account/AccountsDBTable.java
View File

@@ -4,8 +4,4 @@ public class AccountsDBTable extends DBTable<Integer, Account> {
public AccountsDBTable() {
super(Integer.class, Account.class);
}
@Override
public String getSingleDescription() {
return "аккаунт";
}
}

13
src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -9,7 +9,6 @@ import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.UI.CompilerFields;
import _VisualDVM.GlobalData.Compiler.UI.CompilersForm;
@@ -27,14 +26,6 @@ public class CompilersDBTable extends iDBTable<Compiler> {
super(Compiler.class);
}
@Override
public String getSingleDescription() {
return "компилятор";
}
@Override
public String getPluralDescription() {
return "компиляторы";
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(Makefile.class, new FKBehaviour(FKDataBehaviour.DROP, FKCurrentObjectBehaviuor.PASSIVE));
@@ -124,10 +115,6 @@ public class CompilersDBTable extends iDBTable<Compiler> {
return new CompilersForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.Compiler;
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteCompiler;
}

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

@@ -14,6 +14,18 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.Compiler;
}
@Override
public String getSingleDescription() {
return "компилятор";
}
@Override
public String getPluralDescription() {
return "компиляторы";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -41,7 +53,7 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.AddCompiler,
return new DataMenuBar(getPluralDescription(), PassCode.AddCompiler,
PassCode.EditCompiler,
PassCode.DeleteCompiler,
PassCode.ShowCompilerVersion,

4
src/_VisualDVM/GlobalData/DBLastProject/LastProjectsDBTable.java
View File

@@ -15,8 +15,4 @@ public class LastProjectsDBTable extends DBTable<String, DBLastProject> {
public Vector<DBLastProject> getOrdered() {
return getOrderedRecords(new SortByDate());
}
@Override
public String getSingleDescription() {
return "путь к проекту";
}
}

13
src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
View File

@@ -5,7 +5,6 @@ import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.DVMParameter.UI.DVMParameterFields;
import _VisualDVM.GlobalData.DVMParameter.UI.DVMParametersForm;
@@ -18,18 +17,6 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
super(DVMParameter.class);
}
@Override
public String getSingleDescription() {
return "параметр DVM системы";
}
@Override
public String getPluralDescription() {
return "параметры DVM";
}
@Override
public Current CurrentName() {
return Current.DVMParameterValue;
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DVMParametersForm(this, mountPanel);
}

15
src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.DVMParameter.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.Passes.PassCode;
@@ -11,6 +12,18 @@ public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.DVMParameterValue;
}
@Override
public String getSingleDescription() {
return "параметр DVM системы";
}
@Override
public String getPluralDescription() {
return "параметры DVM";
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
@@ -33,7 +46,7 @@ public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
return new DataMenuBar(getPluralDescription(),
PassCode.AddDVMParameter,
PassCode.EditDVMParameter,
PassCode.DeleteDVMParameter);

13
src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
View File

@@ -5,7 +5,6 @@ import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentsValuesForm;
@@ -18,14 +17,6 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
super(EnvironmentValue.class);
}
@Override
public String getSingleDescription() {
return "переменная окружения";
}
@Override
public String getPluralDescription() {
return "переменные окружения";
}
@Override
public DBObjectDialog<EnvironmentValue, EnvironmentValueFields> getDialog() {
return new DBObjectDialog<EnvironmentValue, EnvironmentValueFields>(EnvironmentValueFields.class) {
@Override
@@ -74,10 +65,6 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new EnvironmentsValuesForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.EnvironmentValue;
}
public EnvironmentValue getEnvByName(String name_in) {
for (EnvironmentValue environmentValue : Data.values())
if (environmentValue.name.equalsIgnoreCase(name_in)) return environmentValue;

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

@@ -13,6 +13,18 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.EnvironmentValue;
}
@Override
public String getSingleDescription() {
return "переменная окружения";
}
@Override
public String getPluralDescription() {
return "переменные окружения";
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
@@ -34,7 +46,7 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
return new DataMenuBar(getPluralDescription(),
PassCode.AddEnvironmentValue,
PassCode.EditEnvironmentValue,
PassCode.DeleteEnvironmentValue,

13
src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
View File

@@ -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));
}

15
src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
View File

@@ -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) {

13
src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
View File

@@ -7,7 +7,6 @@ import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Makefile.UI.MakefilesForm;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorFields;
@@ -22,14 +21,6 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
super(Makefile.class);
}
@Override
public String getSingleDescription() {
return "мейкфайл";
}
@Override
public String getPluralDescription() {
return "мейкфайлы";
}
@Override
public DBObjectDialog<Makefile, ModuleAnchestorFields> getDialog() {
return new ModuleAnchestorForm<>();
}
@@ -45,10 +36,6 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
return new MakefilesForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.Makefile;
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteMakefile;
}

14
src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
View File

@@ -13,6 +13,18 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.Makefile;
}
@Override
public String getSingleDescription() {
return "мейкфайл";
}
@Override
public String getPluralDescription() {
return "мейкфайлы";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -43,7 +55,7 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
return new DataMenuBar(getPluralDescription(),
PassCode.Compile,
PassCode.AddMakefile,
PassCode.EditMakefile,

13
src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
View File

@@ -3,7 +3,6 @@ import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
import _VisualDVM.GlobalData.Module.UI.ModulesForm;
@@ -13,14 +12,6 @@ public class ModulesDBTable extends iDBTable<Module> {
super(Module.class);
}
@Override
public String getSingleDescription() {
return "языковой модуль";
}
@Override
public String getPluralDescription() {
return "языковые модули";
}
@Override
public DBObjectDialog<Module, ? extends DialogFields> getDialog() {
return new ModuleAnchestorForm<>();
}
@@ -28,8 +19,4 @@ public class ModulesDBTable extends iDBTable<Module> {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ModulesForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.Module;
}
}

14
src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
View File

@@ -13,6 +13,18 @@ public class ModulesForm extends DataSetControlForm<Module> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.Module;
}
@Override
public String getSingleDescription() {
return "языковой модуль";
}
@Override
public String getPluralDescription() {
return "языковые модули";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -46,7 +58,7 @@ public class ModulesForm extends DataSetControlForm<Module> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.EditModule);
return new DataMenuBar(getPluralDescription(), PassCode.EditModule);
}
@Override
public boolean isObjectVisible(Module object) {

13
src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
View File

@@ -9,7 +9,6 @@ import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
@@ -30,14 +29,6 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
super(RunConfiguration.class);
}
@Override
public String getSingleDescription() {
return "конфигурация запуска";
}
@Override
public String getPluralDescription() {
return "конфигурации запуска";
}
@Override
public DBObjectDialog<RunConfiguration, RunConfigurationFields> getDialog() {
return new DBObjectDialog<RunConfiguration, RunConfigurationFields>(RunConfigurationFields.class) {
@Override
@@ -122,10 +113,6 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new RunConfigurationsForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.RunConfiguration;
}
public void Patch() throws Exception {
for (RunConfiguration c : Data.values()) {
c.Patch();

14
src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
View File

@@ -13,6 +13,18 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.RunConfiguration;
}
@Override
public String getSingleDescription() {
return "конфигурация запуска";
}
@Override
public String getPluralDescription() {
return "конфигурации запуска";
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Команда",
@@ -51,7 +63,7 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
return new DataMenuBar(getPluralDescription(),
PassCode.Run,
PassCode.AddRunConfiguration,
PassCode.EditRunConfiguration,

13
src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
View File

@@ -7,7 +7,6 @@ import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.SapforProfile.UI.SapforProfileFields;
import _VisualDVM.GlobalData.SapforProfile.UI.SapforProfilesForm;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
@@ -20,22 +19,10 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
super(SapforProfile.class);
}
@Override
public String getPluralDescription() {
return "профили SAPFOR";
}
@Override
public String getSingleDescription() {
return "профиль SAPFOR";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforProfilesForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.SapforProfile;
}
@Override
public DBObjectDialog<SapforProfile, SapforProfileFields> getDialog() {
return new DBObjectDialog<SapforProfile, SapforProfileFields>(SapforProfileFields.class) {
@Override

15
src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.SapforProfile.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.Passes.PassCode;
@@ -12,6 +13,18 @@ public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.SapforProfile;
}
@Override
public String getPluralDescription() {
return "профили SAPFOR";
}
@Override
public String getSingleDescription() {
return "профиль SAPFOR";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -35,7 +48,7 @@ public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
return new DataMenuBar(getPluralDescription(),
PassCode.SaveProfile,
PassCode.EditProfile,
PassCode.ApplyProfile,

5
src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.GlobalData.SapforProfileSetting;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.SapforProfileSetting.UI.SapforProfileSettingsForm;
import javax.swing.*;
@@ -13,8 +12,4 @@ public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting>
protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforProfileSettingsForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.SapforProfileSetting;
}
}

4
src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java
View File

@@ -11,6 +11,10 @@ public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileS
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.SapforProfileSetting;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",

6
src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
View File

@@ -10,10 +10,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
public SettingsDBTable() {
super(SettingName.class, DBSetting.class);
}
@Override
public String getSingleDescription() {
return "настройка";
}
public void AddSetting(DBSetting s) throws Exception {
if (containsKey(s.Name)) {
DBSetting old = get(s.Name);
@@ -28,13 +24,13 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
} else
this.getDb().Insert(s);
}
//todo все загнать в Properties
public void AddAll() throws Exception {
//проверка списка всех настроек.
//<editor-fold desc="Global">
AddSetting(new DBSetting(SettingName.ProjectsSearchDirectory, "", SettingType.StringField, ComponentType.Visualiser, false));
AddSetting(new DBSetting(SettingName.EditorFontSize, "14", SettingType.StringField, ComponentType.Visualiser, false));
AddSetting(new DBSetting(SettingName.DarkThemeOn, 0, SettingType.SapforFlag, ComponentType.Visualiser, false));
// AddSetting(new DBSetting(SettingName.FocusPassesResult, 1, SettingType.SapforFlag, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.ShowFullArraysDeclarations, 0, SettingType.SapforFlag, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.ShowFullTabsNames, 0, SettingType.SapforFlag, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.FastAccessPassesCount, 5, SettingType.IntField, ComponentType.Visualiser));

13
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
View File

@@ -6,7 +6,6 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Tasks.CompilationTask.UI.CompilationTasksForm;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.Passes.PassCode;
@@ -18,14 +17,6 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
super(CompilationTask.class);
}
@Override
public String getSingleDescription() {
return "задача на компиляцию";
}
@Override
public String getPluralDescription() {
return "задачи на компиляцию";
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(RunTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
@@ -36,10 +27,6 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
return new CompilationTasksForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.CompilationTask;
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteCompilationTasks;
}

14
src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
View File

@@ -16,6 +16,18 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.CompilationTask;
}
@Override
public String getSingleDescription() {
return "задача на компиляцию";
}
@Override
public String getPluralDescription() {
return "задачи на компиляцию";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -53,7 +65,7 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteCompilationTasks);
return new DataMenuBar(getPluralDescription(), PassCode.DeleteCompilationTasks);
}
@Override
public boolean isObjectVisible(CompilationTask object) {

13
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.Tasks.RunTask;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Tasks.RunTask.UI.RunTasksForm;
import _VisualDVM.Passes.PassCode;
@@ -12,22 +11,10 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
super(RunTask.class);
}
@Override
public String getSingleDescription() {
return "задача на запуск";
}
@Override
public String getPluralDescription() {
return "задачи на запуск";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new RunTasksForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.RunTask;
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteRunTasks;
}

14
src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
View File

@@ -16,6 +16,18 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.RunTask;
}
@Override
public String getSingleDescription() {
return "задача на запуск";
}
@Override
public String getPluralDescription() {
return "задачи на запуск";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -65,7 +77,7 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteRunTasks);
return new DataMenuBar(getPluralDescription(), PassCode.DeleteRunTasks);
}
@Override
public boolean isObjectVisible(RunTask object) {

14
src/_VisualDVM/GlobalData/User/UI/UsersForm.java
View File

@@ -15,6 +15,18 @@ public class UsersForm extends DataSetControlForm<User> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.User;
}
@Override
public String getSingleDescription() {
return "пользователь";
}
@Override
public String getPluralDescription() {
return "пользователи";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -52,7 +64,7 @@ public class UsersForm extends DataSetControlForm<User> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
return new DataMenuBar(getPluralDescription(),
PassCode.AddUser,
PassCode.EditUser,
PassCode.InitialiseUser,

13
src/_VisualDVM/GlobalData/User/UsersDBTable.java
View File

@@ -7,7 +7,6 @@ import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
@@ -23,14 +22,6 @@ public class UsersDBTable extends iDBTable<User> {
super(User.class);
}
@Override
public String getSingleDescription() {
return "пользователь";
}
@Override
public String getPluralDescription() {
return "пользователи";
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(CompilationTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
@@ -77,10 +68,6 @@ public class UsersDBTable extends iDBTable<User> {
return new UsersForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.User;
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteUser;
}