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-16 20:45:59 +03:00
parent 307b83f8c9
commit 5503751e07
65 changed files with 468 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
@@ -14,6 +15,7 @@ import _VisualDVM.GlobalData.Compiler.UI.CompilerFields;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils;
import _VisualDVM.Validators.PathValidator;
@@ -161,7 +163,11 @@ public class CompilersDBTable extends iDBTable<Compiler> {
return Current.Compiler;
}
@Override
public Class getMenuBarClass() {
return CompilersMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),PassCode.AddCompiler,
PassCode.EditCompiler,
PassCode.DeleteCompiler,
PassCode.ShowCompilerVersion,
PassCode.ShowCompilerHelp);
}
}

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

@@ -1,13 +0,0 @@
package _VisualDVM.GlobalData.Compiler;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class CompilersMenuBar extends DataMenuBar {
public CompilersMenuBar() {
super("компиляторы",
PassCode.AddCompiler,
PassCode.EditCompiler,
PassCode.DeleteCompiler,
PassCode.ShowCompilerVersion,
PassCode.ShowCompilerHelp);
}
}

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

@@ -2,11 +2,13 @@ package _VisualDVM.GlobalData.DVMParameter;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.DVMParameter.UI.DVMParameterFields;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils;
public class DVMParameterDBTable extends iDBTable<DVMParameter> {
public DVMParameterDBTable() {
@@ -96,7 +98,10 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
};
}
@Override
public Class getMenuBarClass() {
return DVMParametersMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.AddDVMParameter,
PassCode.EditDVMParameter,
PassCode.DeleteDVMParameter);
}
}

11
src/_VisualDVM/GlobalData/DVMParameter/DVMParametersMenuBar.java
View File

@@ -1,11 +0,0 @@
package _VisualDVM.GlobalData.DVMParameter;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class DVMParametersMenuBar extends DataMenuBar {
public DVMParametersMenuBar() {
super("параметры",
PassCode.AddDVMParameter,
PassCode.EditDVMParameter,
PassCode.DeleteDVMParameter);
}
}

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

@@ -2,11 +2,13 @@ package _VisualDVM.GlobalData.EnvironmentValue;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils;
public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
public EnvironmentValuesDBTable() {
@@ -96,7 +98,11 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
return null;
}
@Override
public Class getMenuBarClass() {
return EnvironmentValuesMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.AddEnvironmentValue,
PassCode.EditEnvironmentValue,
PassCode.DeleteEnvironmentValue,
PassCode.PickCompilerEnvironments);
}
}

12
src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java
View File

@@ -1,12 +0,0 @@
package _VisualDVM.GlobalData.EnvironmentValue;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class EnvironmentValuesMenuBar extends DataMenuBar {
public EnvironmentValuesMenuBar() {
super("переменные окружения", PassCode.AddEnvironmentValue,
PassCode.EditEnvironmentValue,
PassCode.DeleteEnvironmentValue,
PassCode.PickCompilerEnvironments
);
}
}

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

@@ -4,7 +4,9 @@ import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
@@ -19,7 +21,10 @@ import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Passes.PassCode;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.LinkedHashMap;
public class MachinesDBTable extends iDBTable<Machine> {
public MachinesDBTable() {
@@ -127,7 +132,25 @@ public class MachinesDBTable extends iDBTable<Machine> {
return Data.values().stream().anyMatch(machine -> machine.type.equals(MachineType.Local));
}
@Override
public Class getMenuBarClass() {
return MachinesMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.AddMachine,
PassCode.EditMachine,
PassCode.DeleteMachine){
{
add(new MenuBarButton() {
{
setIcon("/Common/icons/SilverArrowUp.png");
setToolTipText("Свернуть");
addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Global.mainModule.getPass(PassCode.UpdateProperty).Do("collapseCredentials", true);
}
});
}
}, 0);
}
};
}
}

29
src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java
View File

@@ -1,29 +0,0 @@
package _VisualDVM.GlobalData.Machine;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public class MachinesMenuBar extends DataMenuBar {
MenuBarButton bCollapse;
public MachinesMenuBar() {
super("машины",
PassCode.AddMachine,
PassCode.EditMachine,
PassCode.DeleteMachine);
this.add(bCollapse = new MenuBarButton() {
{
setIcon("/Common/icons/SilverArrowUp.png");
setToolTipText("Свернуть");
addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Global.mainModule.getPass(PassCode.UpdateProperty).Do("collapseCredentials", true);
}
});
}
}, 0);
}
}

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

@@ -5,12 +5,14 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorFields;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.Passes.PassCode;
import java.util.LinkedHashMap;
public class MakefilesDBTable extends iDBTable<Makefile> {
@@ -75,7 +77,15 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
return Current.Makefile;
}
@Override
public Class getMenuBarClass() {
return MakefilesMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.Compile,
PassCode.AddMakefile,
PassCode.EditMakefile,
PassCode.DeleteMakefile){
{
addSeparator();
addPasses(PassCode.ShowMakefilePreview, PassCode.EditProjectCompilationMaxtime);
}
};
}
}

14
src/_VisualDVM/GlobalData/Makefile/MakefilesMenuBar.java
View File

@@ -1,14 +0,0 @@
package _VisualDVM.GlobalData.Makefile;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class MakefilesMenuBar extends DataMenuBar {
public MakefilesMenuBar() {
super("мейкфайлы",
PassCode.Compile,
PassCode.AddMakefile,
PassCode.EditMakefile,
PassCode.DeleteMakefile);
addSeparator();
addPasses(PassCode.ShowMakefilePreview, PassCode.EditProjectCompilationMaxtime);
}
}

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

@@ -1,10 +1,12 @@
package _VisualDVM.GlobalData.Module;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
import _VisualDVM.Passes.PassCode;
public class ModulesDBTable extends iDBTable<Module> {
public ModulesDBTable() {
super(Module.class);
@@ -63,7 +65,7 @@ public class ModulesDBTable extends iDBTable<Module> {
return Current.Module;
}
@Override
public Class getMenuBarClass() {
return ModulesMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.EditModule);
}
}

8
src/_VisualDVM/GlobalData/Module/ModulesMenuBar.java
View File

@@ -1,8 +0,0 @@
package _VisualDVM.GlobalData.Module;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class ModulesMenuBar extends DataMenuBar {
public ModulesMenuBar() {
super("языковые модули", PassCode.EditModule);
}
}

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

@@ -6,6 +6,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
@@ -17,6 +18,7 @@ import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.GlobalData.RunConfiguration.UI.MatrixBar;
import _VisualDVM.GlobalData.RunConfiguration.UI.RunConfigurationFields;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.awt.event.ActionEvent;
@@ -167,7 +169,16 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
}
}
@Override
public Class getMenuBarClass() {
return RunConfigurationsMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.Run,
PassCode.AddRunConfiguration,
PassCode.EditRunConfiguration,
PassCode.DeleteRunConfiguration){
{
add(new JSeparator());
addPasses(PassCode.EditProjectRunMaxtime);
}
};
}
}

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

@@ -1,13 +0,0 @@
package _VisualDVM.GlobalData.RunConfiguration;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class RunConfigurationsMenuBar extends DataMenuBar {
public RunConfigurationsMenuBar() {
super("конфигурации запуска", PassCode.Run,
PassCode.AddRunConfiguration, PassCode.EditRunConfiguration, PassCode.DeleteRunConfiguration);
add(new JSeparator());
addPasses(PassCode.EditProjectRunMaxtime);
}
}

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

@@ -5,10 +5,12 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.SapforProfile.UI.SapforProfileFields;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
import _VisualDVM.Passes.PassCode;
import java.util.Date;
import java.util.LinkedHashMap;
@@ -17,6 +19,14 @@ 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() {
return new DataSetControlForm(this){
@Override
@@ -71,7 +81,11 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
return res;
}
@Override
public Class getMenuBarClass() {
return SapforProfilesMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SaveProfile,
PassCode.EditProfile,
PassCode.ApplyProfile,
PassCode.DeleteProfile);
}
}

8
src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesMenuBar.java
View File

@@ -1,8 +0,0 @@
package _VisualDVM.GlobalData.SapforProfile;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class SapforProfilesMenuBar extends DataMenuBar {
public SapforProfilesMenuBar() {
super("профили", PassCode.SaveProfile, PassCode.EditProfile, PassCode.ApplyProfile, PassCode.DeleteProfile);
}
}

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

@@ -7,6 +7,10 @@ public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting>
super(SapforProfileSetting.class);
}
@Override
public boolean hasMenuBar() {
return false;
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this) {
@Override

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

@@ -5,7 +5,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.TableMenu;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
@@ -112,7 +112,7 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
return Current.CompilationTask;
}
@Override
public Class getMenuBarClass() {
return CompilationTasksMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteCompilationTasks);
}
}

8
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java
View File

@@ -1,8 +0,0 @@
package _VisualDVM.GlobalData.Tasks.CompilationTask;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class CompilationTasksMenuBar extends DataMenuBar {
public CompilationTasksMenuBar() {
super("задачи на компиляцию", PassCode.DeleteCompilationTasks);
}
}

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

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.Tasks.RunTask;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.TableMenu;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
@@ -77,7 +77,7 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
return Current.RunTask;
}
@Override
public Class getMenuBarClass() {
return RunTasksMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteRunTasks);
}
}

8
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java
View File

@@ -1,8 +0,0 @@
package _VisualDVM.GlobalData.Tasks.RunTask;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class RunTasksMenuBar extends DataMenuBar {
public RunTasksMenuBar() {
super("задачи на запуск", PassCode.DeleteRunTasks);
}
}

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

@@ -5,6 +5,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererStatusEnum;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
@@ -13,6 +14,7 @@ import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.User.UI.UserFields;
import _VisualDVM.Passes.PassCode;
import java.util.LinkedHashMap;
public class UsersDBTable extends iDBTable<User> {
@@ -115,7 +117,11 @@ public class UsersDBTable extends iDBTable<User> {
return Current.User;
}
@Override
public Class getMenuBarClass() {
return UsersMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.AddUser,
PassCode.EditUser,
PassCode.InitialiseUser,
PassCode.DeleteUser);
}
}

11
src/_VisualDVM/GlobalData/User/UsersMenuBar.java
View File

@@ -1,11 +0,0 @@
package _VisualDVM.GlobalData.User;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class UsersMenuBar extends DataMenuBar {
public UsersMenuBar() {
super("пользователи", PassCode.AddUser,
PassCode.EditUser,
PassCode.InitialiseUser,
PassCode.DeleteUser);
}
}