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

24
.idea/workspace.xml generated
View File

@@ -7,7 +7,29 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/BugReportsMenuBar/BugReportsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/CompilersMenuBar/CompilersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/ConfigurationsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DVMParametersMenuBar/DVMParametersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParametersMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/EnvironmentValuesMenuBar/EnvironmentValuesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MachinesMenuBar/MachinesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MakefilesMenuBar/MakefilesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ModulesMenuBar/ModulesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/ModulesMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/RunConfigurationsMenuBar/RunConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforConfigurationCommandsMenuBar/SapforConfigurationCommandsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksBar/SapforTasksMenuBar.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SubscribersMenuBar/SubscribersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/SubscribersMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/UsersMenuBar/UsersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

2
properties
View File

@@ -26,7 +26,7 @@
"PerformanceAnalyzerPath": "",
"ComponentsBackUpsCount": 10,
"TestingKernels": 28,
"AutoCheckTesting": true,
"AutoCheckTesting": false,
"CheckTestingIntervalSeconds": 10,
"EmailOnTestingProgress": false
}

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

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

2
src/Common/UI/Menus_2023/CompilersMenuBar/CompilersMenuBar.java → src/GlobalData/Compiler/CompilersMenuBar.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.CompilersMenuBar;
package GlobalData.Compiler;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class CompilersMenuBar extends DataMenuBar {

2
src/Common/UI/Menus_2023/DVMParametersMenuBar/DVMParametersMenuBar.java → src/GlobalData/DVMParameter/DVMParametersMenuBar.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.DVMParametersMenuBar;
package GlobalData.DVMParameter;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class DVMParametersMenuBar extends DataMenuBar {

2
src/Common/UI/Menus_2023/EnvironmentValuesMenuBar/EnvironmentValuesMenuBar.java → src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.EnvironmentValuesMenuBar;
package GlobalData.EnvironmentValue;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class EnvironmentValuesMenuBar extends DataMenuBar {

2
src/Common/UI/Menus_2023/MachinesMenuBar/MachinesMenuBar.java → src/GlobalData/Machine/MachinesMenuBar.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.MachinesMenuBar;
package GlobalData.Machine;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class MachinesMenuBar extends DataMenuBar {

2
src/Common/UI/Menus_2023/MakefilesMenuBar/MakefilesMenuBar.java → src/GlobalData/Makefile/MakefilesMenuBar.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.MakefilesMenuBar;
package GlobalData.Makefile;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class MakefilesMenuBar extends DataMenuBar {

2
src/Common/UI/Menus_2023/ModulesMenuBar/ModulesMenuBar.java → src/GlobalData/Module/ModulesMenuBar.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.ModulesMenuBar;
package GlobalData.Module;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class ModulesMenuBar extends DataMenuBar {

2
src/Common/UI/Menus_2023/RunConfigurationsMenuBar/RunConfigurationsMenuBar.java → src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.RunConfigurationsMenuBar;
package GlobalData.RunConfiguration;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;

2
src/Common/UI/Menus_2023/UsersMenuBar/UsersMenuBar.java → src/GlobalData/User/UsersMenuBar.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.UsersMenuBar;
package GlobalData.User;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class UsersMenuBar extends DataMenuBar {

2
src/Common/UI/Menus_2023/BugReportsMenuBar/BugReportsMenuBar.java → src/Repository/BugReport/BugReportsMenuBar.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.BugReportsMenuBar;
package Repository.BugReport;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class BugReportsMenuBar extends DataMenuBar {

2
src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java → src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.SubscriberWorkspacesMenuBar;
package Repository.SubscriberWorkspace;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SubscriberWorkspacesMenuBar extends DataMenuBar {

2
src/Common/UI/Menus_2023/SubscribersMenuBar/SubscribersMenuBar.java → src/Repository/Subscribes/SubscribersMenuBar.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.SubscribersMenuBar;
package Repository.Subscribes;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SubscribersMenuBar extends DataMenuBar {

2
src/TestingSystem/Common/Group/GroupsDBTable.java
View File

@@ -2,7 +2,6 @@ package TestingSystem.Common.Group;
import Common.Current;
import Common.Database.*;
import Common.UI.DataSetControlForm;
import Common.UI.Menus_2023.GroupsMenuBar.GroupsMenuBar;
import Common.UI.Menus_2023.VisualiserMenu;
import Common.UI.UI;
import Common.UI.Windows.Dialog.DBObjectDialog;
@@ -10,7 +9,6 @@ import ProjectData.LanguageName;
import TestingSystem.Common.Group.UI.GroupFields;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.Test.TestType;
import TestingSystem.DVM.Tasks.TestRunTask;
import javax.swing.*;
import java.util.LinkedHashMap;

2
src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java → src/TestingSystem/Common/Group/GroupsMenuBar.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.GroupsMenuBar;
package TestingSystem.Common.Group;
import Common.Global;
import Common.UI.Menus_2023.DataMenuBar;
import Common.UI.Menus_2023.MenuBarButton;

2
src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java → src/TestingSystem/Common/Test/TestsMenuBar.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.TestsMenuBar;
package TestingSystem.Common.Test;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class TestsMenuBar extends DataMenuBar {

2
src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java → src/TestingSystem/DVM/Configuration/ConfigurationsMenuBar.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.ConfigurationsMenuBar;
package TestingSystem.DVM.Configuration;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class ConfigurationsMenuBar extends DataMenuBar {

3
src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java → src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java
View File

@@ -1,10 +1,9 @@
package Common.UI.Menus_2023.SapforConfigurationsMenuBar;
package TestingSystem.SAPFOR.SapforConfiguration;
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

2
src/Common/UI/Menus_2023/SapforConfigurationCommandsMenuBar/SapforConfigurationCommandsMenuBar.java → src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsMenuBar.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.SapforConfigurationCommandsMenuBar;
package TestingSystem.SAPFOR.SapforConfigurationCommand;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforConfigurationCommandsMenuBar extends DataMenuBar {

2
src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java → src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java
View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.ServerSapforsBar;
package TestingSystem.SAPFOR.ServerSapfor;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class ServerSapforsBar extends DataMenuBar {