M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

перенос меню баров к соответствующим таблицам в коде.

Browse Source
This commit is contained in:
02090095
2023-12-16 10:38:35 +03:00
parent 0c47c893a2
commit ad19ee2665
23 changed files with 58 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Common/UI/Menus_2023/BugReportsMenuBar/BugReportsMenuBar.java
View File

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

13
src/Common/UI/Menus_2023/CompilersMenuBar/CompilersMenuBar.java
View File

@@ -1,13 +0,0 @@
package Common.UI.Menus_2023.CompilersMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class CompilersMenuBar extends DataMenuBar {
public CompilersMenuBar() {
super("компиляторы",
PassCode_2021.AddCompiler,
PassCode_2021.EditCompiler,
PassCode_2021.DeleteCompiler,
PassCode_2021.ShowCompilerVersion,
PassCode_2021.ShowCompilerHelp);
}
}

15
src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java
View File

@@ -1,15 +0,0 @@
package Common.UI.Menus_2023.ConfigurationsMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class ConfigurationsMenuBar extends DataMenuBar {
public ConfigurationsMenuBar() {
super("конфигурации");
addPasses(
// PassCode_2021.StartTests,
PassCode_2021.PublishConfiguration,
PassCode_2021.EditConfiguration,
PassCode_2021.DeleteConfiguration
);
}
}

11
src/Common/UI/Menus_2023/DVMParametersMenuBar/DVMParametersMenuBar.java
View File

@@ -1,11 +0,0 @@
package Common.UI.Menus_2023.DVMParametersMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class DVMParametersMenuBar extends DataMenuBar {
public DVMParametersMenuBar() {
super("параметры",
PassCode_2021.AddDVMParameter,
PassCode_2021.EditDVMParameter,
PassCode_2021.DeleteDVMParameter);
}
}

12
src/Common/UI/Menus_2023/EnvironmentValuesMenuBar/EnvironmentValuesMenuBar.java
View File

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

48
src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
View File

@@ -1,48 +0,0 @@
package Common.UI.Menus_2023.GroupsMenuBar;
import Common.Global;
import Common.UI.Menus_2023.DataMenuBar;
import Common.UI.Menus_2023.MenuBarButton;
import Common.Utils.Utils;
import TestingSystem.Common.Group.GroupsDBTable;
import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
public class GroupsMenuBar extends DataMenuBar {
public GroupsMenuBar() {
super("группы", PassCode_2021.SynchronizeTests, PassCode_2021.ConvertCorrectnessTests,
PassCode_2021.PublishGroup,
PassCode_2021.CreateGroupFromDirectory,
PassCode_2021.CreateGroupFromFiles,
PassCode_2021.EditGroup,
PassCode_2021.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 ? "/icons/Pick.png" : "/icons/NotPick.png"));
}
});
}
public void addFilters(JMenu typesFilterMenu, JMenu languagesFilterMenu) {
filters = addMenus(typesFilterMenu, languagesFilterMenu);
}
JMenuBar filters= null;
public void DropFilters() {
if (filters != null) {
remove(filters);
filters = null;
}
revalidate();
repaint();
}
}

11
src/Common/UI/Menus_2023/MachinesMenuBar/MachinesMenuBar.java
View File

@@ -1,11 +0,0 @@
package Common.UI.Menus_2023.MachinesMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class MachinesMenuBar extends DataMenuBar {
public MachinesMenuBar() {
super("машины",
PassCode_2021.AddMachine,
PassCode_2021.EditMachine,
PassCode_2021.DeleteMachine);
}
}

14
src/Common/UI/Menus_2023/MakefilesMenuBar/MakefilesMenuBar.java
View File

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

8
src/Common/UI/Menus_2023/ModulesMenuBar/ModulesMenuBar.java
View File

@@ -1,8 +0,0 @@
package Common.UI.Menus_2023.ModulesMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class ModulesMenuBar extends DataMenuBar {
public ModulesMenuBar() {
super("языковые модули", PassCode_2021.EditModule);
}
}

13
src/Common/UI/Menus_2023/RunConfigurationsMenuBar/RunConfigurationsMenuBar.java
View File

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

12
src/Common/UI/Menus_2023/SapforConfigurationCommandsMenuBar/SapforConfigurationCommandsMenuBar.java
View File

@@ -1,12 +0,0 @@
package Common.UI.Menus_2023.SapforConfigurationCommandsMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforConfigurationCommandsMenuBar extends DataMenuBar {
public SapforConfigurationCommandsMenuBar() {
super("команды",
PassCode_2021.PublishSapforConfigurationCommand,
PassCode_2021.EditSapforConfigurationCommand,
PassCode_2021.DeleteSapforConfigurationCommand
);
}
}

13
src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java
View File

@@ -1,13 +0,0 @@
package Common.UI.Menus_2023.SapforConfigurationsMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforConfigurationsMenuBar extends DataMenuBar {
public SapforConfigurationsMenuBar() {
super("конфигурации",
//PassCode_2021.StartSapforTests,
PassCode_2021.PublishSapforConfiguration,
PassCode_2021.EditSapforConfiguration,
PassCode_2021.DeleteSapforConfiguration
);
}
}

7
src/Common/UI/Menus_2023/SapforTasksBar/SapforTasksMenuBar.java
View File

@@ -1,7 +0,0 @@
package Common.UI.Menus_2023.SapforTasksBar;
import Common.UI.Menus_2023.DataMenuBar;
public class SapforTasksMenuBar extends DataMenuBar {
public SapforTasksMenuBar() {
super("задачи");
}
}

11
src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
View File

@@ -1,11 +0,0 @@
package Common.UI.Menus_2023.SapforTasksPackagesBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforTasksPackagesBar extends DataMenuBar {
public SapforTasksPackagesBar() {
super("пакеты задач",
PassCode_2021.AbortSapforTaskPackage,
PassCode_2021.DeleteSapforTasksPackage
);
}
}

8
src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java
View File

@@ -1,8 +0,0 @@
package Common.UI.Menus_2023.ServerSapforsBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class ServerSapforsBar extends DataMenuBar {
public ServerSapforsBar() {
super("версии SAPFOR", PassCode_2021.InstallServerSapfor, PassCode_2021.DeleteServerSapfor);
}
}

8
src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java
View File

@@ -1,8 +0,0 @@
package Common.UI.Menus_2023.SubscriberWorkspacesMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SubscriberWorkspacesMenuBar extends DataMenuBar {
public SubscriberWorkspacesMenuBar() {
super("рабочие пространства", PassCode_2021.DeleteSubscriberWorkspace);
}
}

13
src/Common/UI/Menus_2023/SubscribersMenuBar/SubscribersMenuBar.java
View File

@@ -1,13 +0,0 @@
package Common.UI.Menus_2023.SubscribersMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SubscribersMenuBar extends DataMenuBar {
public SubscribersMenuBar() {
super("Адресаты",
PassCode_2021.SaveBugReportExecutor,
PassCode_2021.SaveBugReportRecipients,
PassCode_2021.AddSubscriber,
PassCode_2021.EditSubscriber,
PassCode_2021.DeleteSubscriber);
}
}

14
src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
View File

@@ -1,14 +0,0 @@
package Common.UI.Menus_2023.TestsMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class TestsMenuBar extends DataMenuBar {
public TestsMenuBar() {
super("тесты",
PassCode_2021.CreateTestFromProject,
PassCode_2021.CreateTestFromDirectory,
PassCode_2021.CreateTestsFromFiles, ///----------------------------
PassCode_2021.EditTest,
PassCode_2021.DownloadTest,
PassCode_2021.DeleteTest);
}
}

11
src/Common/UI/Menus_2023/UsersMenuBar/UsersMenuBar.java
View File

@@ -1,11 +0,0 @@
package Common.UI.Menus_2023.UsersMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class UsersMenuBar extends DataMenuBar {
public UsersMenuBar() {
super("пользователи", PassCode_2021.AddUser,
PassCode_2021.EditUser,
PassCode_2021.InitialiseUser,
PassCode_2021.DeleteUser);
}
}

40
src/Common/UI/UI.java
View File

@@ -2,32 +2,30 @@ package Common.UI;
import Common.Current;
import Common.Database.DataSet;
import Common.Global;
import Common.UI.Menus_2023.BugReportsMenuBar.BugReportsMenuBar;
import Common.UI.Menus_2023.CompilersMenuBar.CompilersMenuBar;
import Common.UI.Menus_2023.ConfigurationsMenuBar.ConfigurationsMenuBar;
import Repository.BugReport.BugReportsMenuBar;
import GlobalData.Compiler.CompilersMenuBar;
import TestingSystem.DVM.Configuration.ConfigurationsMenuBar;
import TestingSystem.DVM.DVMPackage.DVMPackagesBar;
import Common.UI.Menus_2023.DVMParametersMenuBar.DVMParametersMenuBar;
import GlobalData.DVMParameter.DVMParametersMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
import Common.UI.Menus_2023.EnvironmentValuesMenuBar.EnvironmentValuesMenuBar;
import GlobalData.EnvironmentValue.EnvironmentValuesMenuBar;
import Common.UI.Menus_2023.FastAccessMenuBar.FastAccessMenuBar;
import Common.UI.Menus_2023.GroupsMenuBar.GroupsMenuBar;
import Common.UI.Menus_2023.MachinesMenuBar.MachinesMenuBar;
import TestingSystem.Common.Group.GroupsMenuBar;
import GlobalData.Machine.MachinesMenuBar;
import Common.UI.Menus_2023.MainMenuBar.MainMenuBar;
import Common.UI.Menus_2023.MainMenuBar.MainWindow;
import Common.UI.Menus_2023.MakefilesMenuBar.MakefilesMenuBar;
import Common.UI.Menus_2023.ModulesMenuBar.ModulesMenuBar;
import Common.UI.Menus_2023.RunConfigurationsMenuBar.RunConfigurationsMenuBar;
import Common.UI.Menus_2023.SapforConfigurationCommandsMenuBar.SapforConfigurationCommandsMenuBar;
import Common.UI.Menus_2023.SapforConfigurationsMenuBar.SapforConfigurationsMenuBar;
import Common.UI.Menus_2023.SapforTasksBar.SapforTasksMenuBar;
import Common.UI.Menus_2023.SapforTasksPackagesBar.SapforTasksPackagesBar;
import Common.UI.Menus_2023.ServerSapforsBar.ServerSapforsBar;
import Common.UI.Menus_2023.SubscriberWorkspacesMenuBar.SubscriberWorkspacesMenuBar;
import Common.UI.Menus_2023.SubscribersMenuBar.SubscribersMenuBar;
import GlobalData.Makefile.MakefilesMenuBar;
import GlobalData.Module.ModulesMenuBar;
import GlobalData.RunConfiguration.RunConfigurationsMenuBar;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsMenuBar;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationsMenuBar;
import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsBar;
import Repository.SubscriberWorkspace.SubscriberWorkspacesMenuBar;
import Repository.Subscribes.SubscribersMenuBar;
import Common.UI.Menus_2023.TestRunTasksMenuBar.TestRunTasksMenuBar;
import Common.UI.Menus_2023.TestingBar.TestingBar;
import Common.UI.Menus_2023.TestsMenuBar.TestsMenuBar;
import Common.UI.Menus_2023.UsersMenuBar.UsersMenuBar;
import TestingSystem.Common.Test.TestsMenuBar;
import GlobalData.User.UsersMenuBar;
import Common.UI.Menus_2023.VariantsMenuBar.VariantsMenuBar;
import Common.UI.Menus_2023.VersionsMenuBar.VersionsMenuBar;
import Common.UI.Tables.*;
@@ -76,8 +74,6 @@ import Repository.Component.UI.ComponentsForm;
import Repository.Subscribes.SubsribersDBTable;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
import TestingSystem.SAPFOR.SapforTask.SapforTasksDBTable;
import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackagesDBTable;
import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
import TestingSystem.DVM.Configuration.ConfigurationDBTable;
import TestingSystem.Common.Group.GroupsDBTable;
@@ -239,7 +235,6 @@ public class UI {
//---->>
menuBars.put(SapforConfigurationDBTable.class, new SapforConfigurationsMenuBar());
menuBars.put(SapforConfigurationCommandsDBTable.class, new SapforConfigurationCommandsMenuBar());
menuBars.put(SapforTasksPackagesDBTable.class, new SapforTasksPackagesBar());
//---->>
menuBars.put(RegionsSet.class, new DataMenuBar("области распараллеливания"));
menuBars.put(ArraysSet.class, new DataMenuBar("массивы"));
@@ -253,7 +248,6 @@ public class UI {
menuBars.put(SubsribersDBTable.class, new SubscribersMenuBar());
menuBars.put(SapforProfilesDBTable.class, new DataMenuBar("профили", PassCode_2021.SaveProfile, PassCode_2021.EditProfile, PassCode_2021.ApplyProfile, PassCode_2021.DeleteProfile));
menuBars.put(ServerSapforsDBTable.class, new ServerSapforsBar());
menuBars.put(SapforTasksDBTable.class, new SapforTasksMenuBar());
//---->>
}
public static void CreateWindows() {