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

11
src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
View File

@@ -1,6 +1,8 @@
package _VisualDVM.ProjectData.DBArray;
import Common.Database.Tables.DBTable;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
public class ArraysDBTable extends DBTable<String, DBArray> {
public ArraysDBTable() {
@@ -47,7 +49,12 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
return Current.DBArray;
}
@Override
public Class getMenuBarClass() {
return DBArraysMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()){
@Override
public void createSelectionButtons(DataSet dataSet) {
//не нужны.
}
};
}
}

12
src/_VisualDVM/ProjectData/DBArray/DBArraysMenuBar.java
View File

@@ -1,12 +0,0 @@
package _VisualDVM.ProjectData.DBArray;
import Common.Database.Tables.DataSet;
import Common.Visual.Menus.DataMenuBar;
public class DBArraysMenuBar extends DataMenuBar {
public DBArraysMenuBar() {
super("сохранённые состояния");
}
@Override
public void createSelectionButtons(DataSet dataSet) {
//не нужны.
}
}

4
src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
View File

@@ -76,4 +76,8 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
public Comparator<M> getComparator() {
return Comparator.comparingInt(o -> o.line);
}
@Override
public boolean hasMenuBar() {
return false;
}
}

5
src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
View File

@@ -21,9 +21,14 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
columns.get(1).setMinWidth(700);
columns.get(1).setRendererClass(RendererWrapText.class);
}
};
}
@Override
public boolean hasMenuBar() {
return false;
}
@Override
public String[] getUIColumnNames() {
return new String[]{"текст"};
}

7
src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysMenuBar.java
View File

@@ -1,7 +0,0 @@
package _VisualDVM.ProjectData.SapforData.Arrays;
import Common.Visual.Menus.DataMenuBar;
public class ArraysMenuBar extends DataMenuBar {
public ArraysMenuBar() {
super("массивы");
}
}

5
src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.ProjectData.SapforData.Arrays;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererHiddenList;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -77,8 +78,4 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
public void CheckAll(boolean flag) {
Global.mainModule.getPass(PassCode.MassSelectArrays).Do(flag, new Vector(Global.mainModule.getProject().declaratedArrays.Data.values()));
}
@Override
public Class getMenuBarClass() {
return ArraysMenuBar.class;
}
}

7
src/_VisualDVM/ProjectData/SapforData/Regions/RegionsMenuBar.java
View File

@@ -1,7 +0,0 @@
package _VisualDVM.ProjectData.SapforData.Regions;
import Common.Visual.Menus.DataMenuBar;
public class RegionsMenuBar extends DataMenuBar {
public RegionsMenuBar() {
super("области распараллеливания");
}
}

5
src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.ProjectData.SapforData.Regions;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererTopLeft;
import _VisualDVM.Current;
@@ -60,8 +61,4 @@ public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
public String[] getUIColumnNames() {
return new String[]{"Имя", "Строк кода", "Массивов", "Циклов", "Объявлений процедур", "Вызовов процедур", "Фрагменты"};
}
@Override
public Class getMenuBarClass() {
return RegionsMenuBar.class;
}
}

11
src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java
View File

@@ -1,12 +1,13 @@
package _VisualDVM.ProjectData.SapforData.Variants;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMaskedNanInteger;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.SapforData.Variants.UI.RendererVariantRank;
import _VisualDVM.Visual.Menus.VariantsMenuBar.VariantsMenuBar;
public class VariantsSet extends DataSet<String, ParallelVariant> {
public VariantsSet() {
super(String.class, ParallelVariant.class);
@@ -74,7 +75,11 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
return Current.ParallelVariant;
}
@Override
public Class getMenuBarClass() {
return VariantsMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.ShowAllParallelVariants,
PassCode.ShowParallelVariantsCoverage,
PassCode.PredictParallelVariants,
PassCode.CreateParallelVariants);
}
}

14
src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.Repository.BugReport;
import Common.Database.Tables.DBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
@@ -113,7 +114,16 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
return Data.values().stream().filter(bugReport -> bugReport.state.equals(BugReportState.draft)).collect(Collectors.toCollection(Vector::new));
}
@Override
public Class getMenuBarClass() {
return BugReportsMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SynchronizeBugReports,
PassCode.DownloadAllBugReportsArchives,
PassCode.AddBugReport,
PassCode.PublishBugReport,
PassCode.OpenBugReportTestProject,
PassCode.OpenBugReport,
PassCode.UpdateBugReportProgress,
PassCode.CloseBugReport,
PassCode.DeleteBugReport);
}
}

17
src/_VisualDVM/Repository/BugReport/BugReportsMenuBar.java
View File

@@ -1,17 +0,0 @@
package _VisualDVM.Repository.BugReport;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class BugReportsMenuBar extends DataMenuBar {
public BugReportsMenuBar() {
super("отчёты об ошибках",
PassCode.SynchronizeBugReports,
PassCode.DownloadAllBugReportsArchives,
PassCode.AddBugReport,
PassCode.PublishBugReport,
PassCode.OpenBugReportTestProject,
PassCode.OpenBugReport,
PassCode.UpdateBugReportProgress,
PassCode.CloseBugReport,
PassCode.DeleteBugReport);
}
}

28
src/_VisualDVM/Repository/Component/ComponentsSet.java
View File

@@ -1,10 +1,15 @@
package _VisualDVM.Repository.Component;
import Common.Database.Tables.DataSet;
import Common.MainModule_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Menus.VisualiserMenu;
import Common.Visual.Tables.RendererMaskedNanInteger;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Visual.Menus.ComponentsMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import java.util.Vector;
public class ComponentsSet extends DataSet<ComponentType, Component> {
@@ -86,7 +91,24 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
return target;
}
@Override
public Class getMenuBarClass() {
return ComponentsMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.InstallComponentFromFolder,
PassCode.UpdateSelectedComponents,
PassCode.PublishComponent,
PassCode.ShowComponentChangesLog){
{
addMenus(
new VisualiserMenu(
"Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
{
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
add(Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem());
add(Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem());
}
}
);
Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
}
};
}
}

6
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
View File

@@ -1,7 +1,9 @@
package _VisualDVM.Repository.SubscriberWorkspace;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
public SubscriberWorkspaceDBTable() {
super(SubscriberWorkspace.class);
@@ -47,7 +49,7 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
return null;
}
@Override
public Class getMenuBarClass() {
return SubscriberWorkspacesMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
}
}

8
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java
View File

@@ -1,8 +0,0 @@
package _VisualDVM.Repository.SubscriberWorkspace;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class SubscriberWorkspacesMenuBar extends DataMenuBar {
public SubscriberWorkspacesMenuBar() {
super("рабочие пространства", PassCode.DeleteSubscriberWorkspace);
}
}

13
src/_VisualDVM/Repository/Subscribes/SubscribersMenuBar.java
View File

@@ -1,13 +0,0 @@
package _VisualDVM.Repository.Subscribes;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class SubscribersMenuBar extends DataMenuBar {
public SubscribersMenuBar() {
super("Адресаты",
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportRecipients,
PassCode.AddSubscriber,
PassCode.EditSubscriber,
PassCode.DeleteSubscriber);
}
}

17
src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
View File

@@ -5,10 +5,12 @@ import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.Repository.Subscribes.UI.SubscriberFields;
import _VisualDVM.Repository.Subscribes.UI.SubscriberForm;
@@ -20,7 +22,11 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
}
@Override
public String getSingleDescription() {
return "Адресат";
return "адресат";
}
@Override
public String getPluralDescription() {
return "адресаты";
}
@Override
protected DataSetControlForm createUI() {
@@ -71,7 +77,12 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
return res;
}
@Override
public Class getMenuBarClass() {
return SubscribersMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportRecipients,
PassCode.AddSubscriber,
PassCode.EditSubscriber,
PassCode.DeleteSubscriber);
}
}

35
src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
View File

@@ -4,17 +4,25 @@ import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DBObjectFilter;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFilter;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Group.UI.AddGroupMenu;
import _VisualDVM.TestingSystem.Common.Group.UI.EditGroupMenu;
import _VisualDVM.TestingSystem.Common.Group.UI.GroupFields;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.Common.Test.TestType;
import javax.swing.*;
import java.util.LinkedHashMap;
//-
public class GroupsDBTable extends iDBTable<Group> {
@@ -146,7 +154,30 @@ public class GroupsDBTable extends iDBTable<Group> {
return null;
}
@Override
public Class getMenuBarClass() {
return GroupsMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SynchronizeTests,
PassCode.ConvertCorrectnessTests){
{
addMenus(new AddGroupMenu(), new EditGroupMenu());
addPasses(PassCode.DeleteGroup);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только группы тестов авторства пользователя");
Mark();
addActionListener(e -> {
GroupsDBTable.filterMyOnly = !GroupsDBTable.filterMyOnly;
Mark();
Global.testingServer.db.groups.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(GroupsDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
};
}
}

36
src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java
View File

@@ -1,36 +0,0 @@
package _VisualDVM.TestingSystem.Common.Group;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.Common.Group.UI.AddGroupMenu;
import _VisualDVM.TestingSystem.Common.Group.UI.EditGroupMenu;
import javax.swing.*;
public class GroupsMenuBar extends DataMenuBar {
public GroupsMenuBar() {
super("группы",
PassCode.SynchronizeTests,
PassCode.ConvertCorrectnessTests
);
addMenus(new AddGroupMenu(), new EditGroupMenu());
addPasses(PassCode.DeleteGroup);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только группы тестов авторства пользователя");
Mark();
addActionListener(e -> {
GroupsDBTable.filterMyOnly = !GroupsDBTable.filterMyOnly;
Mark();
Global.testingServer.db.groups.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(GroupsDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
}

15
src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
View File

@@ -1,10 +1,14 @@
package _VisualDVM.TestingSystem.Common.Test;
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.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.UI.AddTestMenu;
import _VisualDVM.TestingSystem.Common.Test.UI.EditTestMenu;
import _VisualDVM.TestingSystem.Common.Test.UI.TestFields;
import java.util.Vector;
@@ -14,7 +18,7 @@ public class TestDBTable extends iDBTable<Test> {
}
@Override
public String getSingleDescription() {
return "тест DVM";
return "тест";
}
@Override
public String getPluralDescription() {
@@ -125,7 +129,12 @@ public class TestDBTable extends iDBTable<Test> {
return selectedTests.isEmpty() ? allTests : selectedTests;
}
@Override
public Class getMenuBarClass() {
return TestsMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()){
{
addMenus(new AddTestMenu(), new EditTestMenu());
addPasses(PassCode.DownloadTest, PassCode.DeleteTest);
}
};
}
}

12
src/_VisualDVM/TestingSystem/Common/Test/TestsMenuBar.java
View File

@@ -1,12 +0,0 @@
package _VisualDVM.TestingSystem.Common.Test;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.Common.Test.UI.AddTestMenu;
import _VisualDVM.TestingSystem.Common.Test.UI.EditTestMenu;
public class TestsMenuBar extends DataMenuBar {
public TestsMenuBar() {
super("тесты");
addMenus(new AddTestMenu(), new EditTestMenu());
addPasses(PassCode.DownloadTest, PassCode.DeleteTest);
}
}

16
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
View File

@@ -2,10 +2,12 @@ package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields;
@@ -19,11 +21,11 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
}
@Override
public String getSingleDescription() {
return "конфигурация тестирования DVM системы";
return "конфигурация";
}
@Override
public String getPluralDescription() {
return "конфигурации тестирования DVM системы";
return "конфигурации";
}
@Override
protected DataSetControlForm createUI() {
@@ -115,7 +117,13 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
return (Global.mainModule.getAccount().CheckAccessRights(((DVMConfiguration) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
}
@Override
public Class getMenuBarClass() {
return DVMConfigurationsMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishConfiguration,
PassCode.EditConfiguration,
PassCode.ShowCurrentDVMConfigurationTests,
PassCode.SaveCurrentDVMConfiguration,
PassCode.DeleteConfiguration,
PassCode.StartSelectedDVMConfigurations );
}
}

16
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java
View File

@@ -1,16 +0,0 @@
package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class DVMConfigurationsMenuBar extends DataMenuBar {
public DVMConfigurationsMenuBar() {
super("конфигурации");
addPasses(
PassCode.PublishConfiguration,
PassCode.EditConfiguration,
PassCode.ShowCurrentDVMConfigurationTests,
PassCode.SaveCurrentDVMConfiguration,
PassCode.DeleteConfiguration,
PassCode.StartSelectedDVMConfigurations
);
}
}

53
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
View File

@@ -1,6 +1,9 @@
package _VisualDVM.TestingSystem.DVM.DVMPackage;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererProgressBar;
@@ -11,6 +14,7 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import javax.swing.*;
import java.util.Comparator;
import java.util.Date;
public class DVMPackageDBTable extends iDBTable<DVMPackage> {
@@ -25,11 +29,11 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
}
@Override
public String getSingleDescription() {
return "пакет задач DVM";
return "пакет";
}
@Override
public String getPluralDescription() {
return "пакеты задач DVM";
return "пакеты";
}
@Override
protected DataSetControlForm createUI() {
@@ -123,7 +127,48 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public Class getMenuBarClass() {
return DVMPackagesBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()){
{
addPasses(PassCode.SynchronizeTests);
addSeparator();
addPasses(PassCode.AbortDVMPackage);
addSeparator();
addPasses(PassCode.DownloadDVMPackage,
PassCode.ExportDVMPackageToExcel,
PassCode.DeleteDVMPackage);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterMyOnly = !DVMPackageDBTable.filterMyOnly;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(DVMPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
add(new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterActive = !DVMPackageDBTable.filterActive;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(DVMPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
};
}
}

51
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
View File

@@ -1,51 +0,0 @@
package _VisualDVM.TestingSystem.DVM.DVMPackage;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class DVMPackagesBar extends DataMenuBar {
public DVMPackagesBar() {
super("пакеты задач DVM");
addPasses(PassCode.SynchronizeTests);
addSeparator();
addPasses(PassCode.AbortDVMPackage);
addSeparator();
addPasses(PassCode.DownloadDVMPackage,
PassCode.ExportDVMPackageToExcel,
PassCode.DeleteDVMPackage);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterMyOnly = !DVMPackageDBTable.filterMyOnly;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(DVMPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
add(new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterActive = !DVMPackageDBTable.filterActive;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(DVMPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
}

15
src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
View File

@@ -2,10 +2,11 @@ package _VisualDVM.TestingSystem.DVM.DVMSettings;
import Common.Database.Objects.DBObject;
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.Global;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsBar;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields;
public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
public DVMSettingsDBTable() {
@@ -17,11 +18,11 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
}
@Override
public String getSingleDescription() {
return "параметры тестирования DVM системы";
return "параметры тестирования";
}
@Override
public String getPluralDescription() {
return "параметры тестирования DVM системы";
return "параметры тестирования";
}
//--
@Override
@@ -146,7 +147,11 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
return (Global.mainModule.getAccount().CheckAccessRights(((DVMSettings) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
}
@Override
public Class getMenuBarClass() {
return DVMSettingsBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishDVMSettings,
PassCode.CloneDVMSettings,
PassCode.EditDVMSettings,
PassCode.DeleteDVMSettings);
}
}

13
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java
View File

@@ -1,13 +0,0 @@
package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class DVMSettingsBar extends DataMenuBar {
public DVMSettingsBar() {
super("параметры тестированя",
PassCode.PublishDVMSettings,
PassCode.CloneDVMSettings,
PassCode.EditDVMSettings,
PassCode.DeleteDVMSettings
);
}
}

9
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java
View File

@@ -1,9 +0,0 @@
package _VisualDVM.TestingSystem.DVM.DVMTasks;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class DVMRunTasksBar extends DataMenuBar {
public DVMRunTasksBar() {
super("задачи",
PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
}
}

6
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
View File

@@ -3,10 +3,12 @@ import Common.Database.Tables.DataSet;
import Common.Visual.DBObjectFilter;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFilter;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import java.util.Comparator;
@@ -162,7 +164,7 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public Class getMenuBarClass() {
return DVMRunTasksBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
}
}

14
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
View File

@@ -2,9 +2,11 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
import Common.Database.Tables.iDBTable;
import Common.Utils.Vector_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields;
@@ -22,7 +24,7 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
}
@Override
public String getSingleDescription() {
return "конфигурация тестирования SAPFOR";
return "конфигурация";
}
@Override
public String getPluralDescription() {
@@ -129,7 +131,13 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
return null;
}
@Override
public Class getMenuBarClass() {
return SapforConfigurationsMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishSapforConfiguration,
PassCode.EditSapforConfiguration,
PassCode.ShowCurrentSAPFORConfigurationTests,
PassCode.SaveCurrentSAPFORConfiguration,
PassCode.DeleteSapforConfiguration,
PassCode.StartSelectedSAPFORConfigurations);
}
}

15
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java
View File

@@ -1,15 +0,0 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class SapforConfigurationsMenuBar extends DataMenuBar {
public SapforConfigurationsMenuBar() {
super("конфигурации",
PassCode.PublishSapforConfiguration,
PassCode.EditSapforConfiguration,
PassCode.ShowCurrentSAPFORConfigurationTests,
PassCode.SaveCurrentSAPFORConfiguration,
PassCode.DeleteSapforConfiguration,
PassCode.StartSelectedSAPFORConfigurations
);
}
}

53
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
View File

@@ -1,6 +1,9 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforPackage;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererProgressBar;
@@ -10,8 +13,8 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackagesBar;
import javax.swing.*;
import java.util.Comparator;
import java.util.Date;
public class SapforPackageDBTable extends iDBTable<SapforPackage> {
@@ -26,11 +29,11 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
}
@Override
public String getSingleDescription() {
return "пакет задач SAPFOR";
return "пакет";
}
@Override
public String getPluralDescription() {
return "пакеты задач SAPFOR";
return "пакеты";
}
@Override
protected DataSetControlForm createUI() {
@@ -104,7 +107,47 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public Class getMenuBarClass() {
return SapforPackagesBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),PassCode.SynchronizeTests){
{
addSeparator();
addPasses(PassCode.AbortSapforPackage);
addSeparator();
addPasses(PassCode.CompareSapforPackages);
addSeparator();
addPasses(PassCode.DeleteSapforPackage);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
SapforPackageDBTable.filterMyOnly = !SapforPackageDBTable.filterMyOnly;
Mark();
Global.testingServer.db.sapforPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(SapforPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
add(new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
Mark();
addActionListener(e -> {
SapforPackageDBTable.filterActive = !SapforPackageDBTable.filterActive;
Mark();
Global.testingServer.db.sapforPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(SapforPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
};
}
}

13
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java
View File

@@ -1,13 +0,0 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettings;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class SapforSettingsBar extends DataMenuBar {
public SapforSettingsBar() {
super("параметры тестирования",
PassCode.PublishSapforSettings,
PassCode.CloneSapforSettings,
PassCode.EditSapforSettings,
PassCode.DeleteSapforSettings
);
}
}

14
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
View File

@@ -6,8 +6,10 @@ 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.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsFields;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
@@ -22,11 +24,11 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
}
@Override
public String getSingleDescription() {
return "параметры тестирования системы SAPFOR";
return "параметры тестирования";
}
@Override
public String getPluralDescription() {
return "параметры тестирования системы SAPFOR";
return "параметры тестирования";
}
@Override
protected DataSetControlForm createUI() {
@@ -116,7 +118,11 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
return res;
}
@Override
public Class getMenuBarClass() {
return SapforSettingsBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishSapforSettings,
PassCode.CloneSapforSettings,
PassCode.EditSapforSettings,
PassCode.DeleteSapforSettings);
}
}

12
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java
View File

@@ -1,12 +0,0 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class SapforSettingsCommandsBar extends DataMenuBar {
public SapforSettingsCommandsBar() {
super("команды",
PassCode.PublishSapforSettingsCommand,
PassCode.EditSapforSettingsCommand,
PassCode.DeleteSapforSettingsCommand
);
}
}

8
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand;
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;
@@ -82,7 +83,10 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
return res;
}
@Override
public Class getMenuBarClass() {
return SapforSettingsCommandsBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishSapforSettingsCommand,
PassCode.EditSapforSettingsCommand,
PassCode.DeleteSapforSettingsCommand);
}
}

52
src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
View File

@@ -1,52 +0,0 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import javax.swing.*;
public class SapforPackagesBar extends DataMenuBar {
public SapforPackagesBar() {
super("пакеты задач SAPFOR");
addPasses(PassCode.SynchronizeTests);
addSeparator();
addPasses(PassCode.AbortSapforPackage);
addSeparator();
addPasses(PassCode.CompareSapforPackages);
addSeparator();
addPasses(PassCode.DeleteSapforPackage);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
SapforPackageDBTable.filterMyOnly = !SapforPackageDBTable.filterMyOnly;
Mark();
Global.testingServer.db.sapforPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(SapforPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
add(new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
Mark();
addActionListener(e -> {
SapforPackageDBTable.filterActive = !SapforPackageDBTable.filterActive;
Mark();
Global.testingServer.db.sapforPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(SapforPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
}

13
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java
View File

@@ -1,13 +0,0 @@
package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class ServerSapforsBar extends DataMenuBar {
public ServerSapforsBar() {
super("версии SAPFOR",
PassCode.CompileServerSapfor,
PassCode.ShowSapforCompilationOut,
PassCode.ShowSapforCompilationErr,
PassCode.DeleteServerSapfor
);
}
}

14
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
View File

@@ -1,10 +1,12 @@
package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import java.util.Comparator;
public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
@@ -13,11 +15,11 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
}
@Override
public String getSingleDescription() {
return "SAPFOR";
return "версия SAPFOR";
}
@Override
public String getPluralDescription() {
return "SAPFOR";
return "версии SAPFOR";
}
@Override
public Current CurrentName() {
@@ -73,7 +75,11 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public Class getMenuBarClass() {
return ServerSapforsBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.CompileServerSapfor,
PassCode.ShowSapforCompilationOut,
PassCode.ShowSapforCompilationErr,
PassCode.DeleteServerSapfor);
}
}

27
src/_VisualDVM/Visual/Menus/ComponentsMenuBar.java
View File

@@ -1,27 +0,0 @@
package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
public class ComponentsMenuBar extends DataMenuBar {
public ComponentsMenuBar() {
super("компоненты");
addMenus(
new VisualiserMenu(
"Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
{
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
add(Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem());
add(Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem());
}
}
);
addPasses(PassCode.InstallComponentFromFolder,
PassCode.UpdateSelectedComponents,
PassCode.PublishComponent,
PassCode.ShowComponentChangesLog);
Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
}
}

10
src/_VisualDVM/Visual/Menus/VariantsMenuBar/VariantsMenuBar.java
View File

@@ -1,10 +0,0 @@
package _VisualDVM.Visual.Menus.VariantsMenuBar;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class VariantsMenuBar extends DataMenuBar {
public VariantsMenuBar() {
super("варианты");
addPasses(PassCode.ShowAllParallelVariants, PassCode.ShowParallelVariantsCoverage,
PassCode.PredictParallelVariants, PassCode.CreateParallelVariants);
}
}