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

no message

Browse Source
This commit is contained in:
02090095
2024-10-14 20:17:29 +03:00
parent bdbd49fa6d
commit 84acf05c19
50 changed files with 303 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Common/Database/Tables/DataSet.java
View File

@@ -1,6 +1,7 @@
package Common.Database.Tables;
import Common.Current_;
import Common.Database.Objects.DBObject;
import Common.MainModule_;
import Common.Utils.TextLog;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFilter;
@@ -47,10 +48,10 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
ui_ = createUI();
ui_.setContent(content_in);
//-->
if (UI_.menuBars.containsKey(getClass())) {
DataMenuBar bar = UI_.menuBars.get(getClass());
if (MainModule_.instance.getUI().menuBars.containsKey(getClass())) {
DataMenuBar bar = MainModule_.instance.getUI().menuBars.get(getClass());
content_in.add(bar, BorderLayout.NORTH);
setFilterUI(count -> UI_.menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
setFilterUI(count -> MainModule_.instance.getUI().menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
if (ui_.hasCheckBox())
bar.createSelectionButtons(this);
}
@@ -58,7 +59,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
//----
createFilters();
if (!filters.isEmpty()) {
DataMenuBar menuBar = UI_.menuBars.get(getClass());
DataMenuBar menuBar = MainModule_.instance.getUI().menuBars.get(getClass());
for (DataSetFilter<D> filter : filters)
menuBar.addMenus(filter.menu);
}

2
src/Common/MainModule_.java
View File

@@ -34,7 +34,7 @@ public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModu
if (ui_class!=null)
ui=ui_class.newInstance();
//--
createPasses();//System.out.println(
createPasses();
//-
objects = new LinkedHashMap<>();
}

2
src/Common/Visual/Controls/TabToolBar.java
View File

@@ -1,7 +1,7 @@
package Common.Visual.Controls;
import Common.MainModule_;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Menus.VisualiserMenuBar;
import javax.swing.*;
import java.awt.event.MouseAdapter;

2
src/Common/Visual/DataSetFilter.java
View File

@@ -2,7 +2,7 @@ package Common.Visual;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.DataSet;
import Common.Visual.Controls.StableMenuItem;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenu;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

1
src/Common/Visual/Menus/DataMenuBar.java
View File

@@ -2,7 +2,6 @@ package Common.Visual.Menus;
import Common.Database.Tables.DataSet;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import javax.swing.*;
import java.awt.*;

14
src/_VisualDVM/Visual/Menus/VisualiserMenu.java → src/Common/Visual/Menus/VisualiserMenu.java
View File

@@ -1,5 +1,6 @@
package _VisualDVM.Visual.Menus;
package Common.Visual.Menus;
import Common.MainModule_;
import Common.Passes.PassCode_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
@@ -14,6 +15,11 @@ public class VisualiserMenu extends JMenu {
setToolTipText(text);
if (textVisible)
setText(text);
System.out.println("--");
System.out.println(MainModule_.instance);
System.out.println(MainModule_.instance.getUI());
System.out.println(MainModule_.instance.getUI().getTheme());
System.out.println("<<");
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (!iconPath.isEmpty())
setIcon(Utils_.getIcon(iconPath));
@@ -21,8 +27,8 @@ public class VisualiserMenu extends JMenu {
public VisualiserMenu(String text, String iconPath) {
this(text, iconPath, false);
}
public void addPasses(PassCode... codes) {
for (PassCode code : codes)
add(Global.mainModule.getPass(code).createMenuItem());
public void addPasses(PassCode_... codes) {
for (PassCode_ code : codes)
add(MainModule_.instance.getPass(code).createMenuItem());
}
}

2
src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java → src/Common/Visual/Menus/VisualiserMenuBar.java
View File

@@ -1,4 +1,4 @@
package _VisualDVM.Visual.Menus;
package Common.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;

6
src/Common/Visual/UIModule_.java
View File

@@ -1,8 +1,12 @@
package Common.Visual;
import Common.Database.Tables.DataSet;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Themes.DefaultTheme;
import Common.Visual.Themes.VisualiserTheme;
import Common.Visual.Windows.PassForm;
import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar;
import java.util.LinkedHashMap;
public class UIModule_ {
//--
VisualiserTheme theme = new DefaultTheme();
@@ -24,4 +28,6 @@ public class UIModule_ {
//--
FastAccessMenuBar fastAccessMenuBar = new FastAccessMenuBar();
public FastAccessMenuBar getFastAccessMenuBar(){return fastAccessMenuBar;}
//-
public LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
}

1
src/Common/Visual/UI_.java
View File

@@ -14,7 +14,6 @@ import java.util.Stack;
public class UI_ {
public static boolean active = false; //есть ли интерфейс. в консольных версиях не нужен.
//---
public static LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
public static Stack<Component> windowsStack = new Stack<>();
public static boolean isActive() {
return active;

1
src/_VisualDVM/Global.java
View File

@@ -244,7 +244,6 @@ public class Global {
//создание списков служебных объектов
UI.CreateAll();
//единственное меню до остальных.
UI_.menuBars.put(ComponentsSet.class, new ComponentsMenuBar());
Components = new ComponentsSet();
mainModule.set(Current.ProjectView, ProjectView.Files);
Components.put(ComponentType.Visualiser, visualiser = new Visualiser());

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

@@ -0,0 +1,8 @@
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);
}
}

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

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

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

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

55
src/_VisualDVM/MainModule.java
View File

@@ -1,40 +1,95 @@
package _VisualDVM;
import Common.Database.Tables.DataSet;
import Common.MainModule_;
import Common.Utils.Vector_;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI_;
import _VisualDVM.GlobalData.Account.Account;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilersDBTable;
import _VisualDVM.GlobalData.Compiler.CompilersMenuBar;
import _VisualDVM.GlobalData.Credentials.Credentials;
import _VisualDVM.GlobalData.DVMParameter.DVMParameterDBTable;
import _VisualDVM.GlobalData.DVMParameter.DVMParametersMenuBar;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesMenuBar;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachinesDBTable;
import _VisualDVM.GlobalData.Machine.MachinesMenuBar;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Makefile.MakefilesDBTable;
import _VisualDVM.GlobalData.Makefile.MakefilesMenuBar;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.Module.ModulesDBTable;
import _VisualDVM.GlobalData.Module.ModulesMenuBar;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.RunConfiguration.RunConfigurationsDBTable;
import _VisualDVM.GlobalData.RunConfiguration.RunConfigurationsMenuBar;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.GlobalData.SapforProfile.SapforProfilesDBTable;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTasksDBTable;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.GlobalData.User.UsersDBTable;
import _VisualDVM.GlobalData.User.UsersMenuBar;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.DBArray.ArraysDBTable;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.ProjectData.SapforData.Arrays.ArraysSet;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import _VisualDVM.ProjectData.SapforData.Regions.RegionsSet;
import _VisualDVM.ProjectData.SapforData.Variants.VariantsSet;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportsDBTable;
import _VisualDVM.Repository.BugReport.BugReportsMenuBar;
import _VisualDVM.Repository.Component.Component;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspacesMenuBar;
import _VisualDVM.Repository.Subscribes.Subscriber;
import _VisualDVM.Repository.Subscribes.SubscribersMenuBar;
import _VisualDVM.Repository.Subscribes.SubsribersDBTable;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
import _VisualDVM.TestingSystem.Common.Group.GroupsMenuBar;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.Common.Test.TestDBTable;
import _VisualDVM.TestingSystem.Common.Test.TestsMenuBar;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfigurationDBTable;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfigurationsMenuBar;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackagesBar;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettingsDBTable;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsBar;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTasksBar;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTasksSet;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationsMenuBar;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettingsBar;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettingsDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommandsBar;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommandsDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackagesBar;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsBar;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
import _VisualDVM.Visual.MainUI;
import _VisualDVM.Visual.Menus.VariantsMenuBar.VariantsMenuBar;
import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
import javax.swing.tree.DefaultMutableTreeNode;

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

@@ -0,0 +1,12 @@
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) {
//не нужны.
}
}

8
src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysMenuBar.java Normal file
View File

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

8
src/_VisualDVM/ProjectData/SapforData/Regions/RegionsMenuBar.java Normal file
View File

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

2
src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.TestingSystem.Common.Group.UI;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenu;
public class AddGroupMenu extends VisualiserMenu {
public AddGroupMenu() {
super("", "/icons/RedAdd.png");

2
src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.TestingSystem.Common.Group.UI;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenu;
public class EditGroupMenu extends VisualiserMenu {
public EditGroupMenu() {
super("", "/icons/Edit.png");

2
src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.TestingSystem.Common.Test.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenu;
public class AddTestMenu extends VisualiserMenu {
public AddTestMenu() {
super("Добавление теста", "/icons/RedAdd.png", false);

2
src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.TestingSystem.Common.Test.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenu;
public class EditTestMenu extends VisualiserMenu {
public EditTestMenu() {
super("Редактирование теста", "/icons/Edit.png", false);

2
src/_VisualDVM/TestingSystem/Common/TestingBar.java
View File

@@ -6,7 +6,7 @@ import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Menus.VisualiserMenuBar;
import javax.swing.*;
import java.awt.*;

2
src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenu;
public class AddSapforPackageMenu extends VisualiserMenu {
public AddSapforPackageMenu() {
super("", "/icons/RedAdd.png");

95
src/_VisualDVM/Visual/MainUI.java
View File

@@ -1,9 +1,102 @@
package _VisualDVM.Visual;
import Common.Visual.UIModule_;
import Common.Visual.UI_;
import _VisualDVM.GlobalData.Compiler.CompilersDBTable;
import _VisualDVM.GlobalData.Compiler.CompilersMenuBar;
import _VisualDVM.GlobalData.DVMParameter.DVMParameterDBTable;
import _VisualDVM.GlobalData.DVMParameter.DVMParametersMenuBar;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesMenuBar;
import _VisualDVM.GlobalData.Machine.MachinesDBTable;
import _VisualDVM.GlobalData.Machine.MachinesMenuBar;
import _VisualDVM.GlobalData.Makefile.MakefilesDBTable;
import _VisualDVM.GlobalData.Makefile.MakefilesMenuBar;
import _VisualDVM.GlobalData.Module.ModulesDBTable;
import _VisualDVM.GlobalData.Module.ModulesMenuBar;
import _VisualDVM.GlobalData.RunConfiguration.RunConfigurationsDBTable;
import _VisualDVM.GlobalData.RunConfiguration.RunConfigurationsMenuBar;
import _VisualDVM.GlobalData.SapforProfile.SapforProfilesDBTable;
import _VisualDVM.GlobalData.SapforProfile.SapforProfilesMenuBar;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTasksMenuBar;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTasksDBTable;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTasksMenuBar;
import _VisualDVM.GlobalData.User.UsersDBTable;
import _VisualDVM.GlobalData.User.UsersMenuBar;
import _VisualDVM.ProjectData.DBArray.ArraysDBTable;
import _VisualDVM.ProjectData.DBArray.DBArraysMenuBar;
import _VisualDVM.ProjectData.SapforData.Arrays.ArraysMenuBar;
import _VisualDVM.ProjectData.SapforData.Arrays.ArraysSet;
import _VisualDVM.ProjectData.SapforData.Regions.RegionsMenuBar;
import _VisualDVM.ProjectData.SapforData.Regions.RegionsSet;
import _VisualDVM.ProjectData.SapforData.Variants.VariantsSet;
import _VisualDVM.Repository.BugReport.BugReportsDBTable;
import _VisualDVM.Repository.BugReport.BugReportsMenuBar;
import _VisualDVM.Visual.Menus.ComponentsMenuBar;
import _VisualDVM.Repository.Component.ComponentsSet;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspacesMenuBar;
import _VisualDVM.Repository.Subscribes.SubscribersMenuBar;
import _VisualDVM.Repository.Subscribes.SubsribersDBTable;
import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
import _VisualDVM.TestingSystem.Common.Group.GroupsMenuBar;
import _VisualDVM.TestingSystem.Common.Test.TestDBTable;
import _VisualDVM.TestingSystem.Common.Test.TestsMenuBar;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfigurationDBTable;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfigurationsMenuBar;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackagesBar;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettingsDBTable;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsBar;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTasksBar;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTasksSet;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationsMenuBar;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettingsBar;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettingsDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommandsBar;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommandsDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackagesBar;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsBar;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
import _VisualDVM.Visual.Menus.VariantsMenuBar.VariantsMenuBar;
import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
public class MainUI extends UIModule_ {
public MainUI(){
setTheme(new LightSPFEditorTheme());
menuBars.put(ComponentsSet.class, new ComponentsMenuBar());
menuBars.put(BugReportsDBTable.class, new BugReportsMenuBar());
menuBars.put(SubscriberWorkspaceDBTable.class, new SubscriberWorkspacesMenuBar());
//---------------------------------------------------->>
menuBars.put(GroupsDBTable.class, new GroupsMenuBar());
menuBars.put(TestDBTable.class, new TestsMenuBar());
menuBars.put(DVMConfigurationDBTable.class, new DVMConfigurationsMenuBar());
menuBars.put(DVMPackageDBTable.class, new DVMPackagesBar());
menuBars.put(SapforPackageDBTable.class, new SapforPackagesBar());
menuBars.put(DVMRunTasksSet.class, new DVMRunTasksBar());
//--->>>
menuBars.put(MachinesDBTable.class, new MachinesMenuBar());
menuBars.put(UsersDBTable.class, new UsersMenuBar());
menuBars.put(CompilersDBTable.class, new CompilersMenuBar());
menuBars.put(MakefilesDBTable.class, new MakefilesMenuBar());
menuBars.put(ModulesDBTable.class, new ModulesMenuBar());
menuBars.put(RunConfigurationsDBTable.class, new RunConfigurationsMenuBar());
menuBars.put(EnvironmentValuesDBTable.class, new EnvironmentValuesMenuBar());
menuBars.put(DVMParameterDBTable.class, new DVMParametersMenuBar());
menuBars.put(CompilationTasksDBTable.class, new CompilationTasksMenuBar());
menuBars.put(RunTasksDBTable.class, new RunTasksMenuBar());
//---->>
menuBars.put(SapforConfigurationDBTable.class, new SapforConfigurationsMenuBar());
//---->>
menuBars.put(RegionsSet.class, new RegionsMenuBar());
menuBars.put(ArraysSet.class, new ArraysMenuBar());
menuBars.put(ArraysDBTable.class, new DBArraysMenuBar());
menuBars.put(VariantsSet.class, new VariantsMenuBar());
menuBars.put(SubsribersDBTable.class, new SubscribersMenuBar());
menuBars.put(SapforProfilesDBTable.class, new SapforProfilesMenuBar());
menuBars.put(ServerSapforsDBTable.class, new ServerSapforsBar());
menuBars.put(SapforSettingsDBTable.class, new SapforSettingsBar());
menuBars.put(SapforSettingsCommandsDBTable.class, new SapforSettingsCommandsBar());
menuBars.put(DVMSettingsDBTable.class, new DVMSettingsBar());
}
}

5
src/_VisualDVM/Repository/Component/ComponentsMenuBar.java → src/_VisualDVM/Visual/Menus/ComponentsMenuBar.java
View File

@@ -1,11 +1,10 @@
package _VisualDVM.Repository.Component;
package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenu;
public class ComponentsMenuBar extends DataMenuBar {
public ComponentsMenuBar() {
super("компоненты");

2
src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java
View File

@@ -3,7 +3,7 @@ import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Menus.VisualiserMenuBar;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

2
src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
View File

@@ -4,7 +4,7 @@ import Common.Passes.Pass;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Menus.VisualiserMenuBar;
import javax.swing.*;
import java.awt.*;

2
src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java
View File

@@ -2,7 +2,7 @@ package _VisualDVM.Visual.Menus.FileMenuBar;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.UI;
import javax.swing.*;

2
src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java
View File

@@ -6,7 +6,7 @@ import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Visual.Menus.LanguagesSubmenu;
import _VisualDVM.Visual.Menus.StylesSubmenu;
import _VisualDVM.Visual.Menus.TypesSubmenu;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Visual.UI;
import javax.swing.*;

1
src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.Utils_;
import Common.Visual.Controls.StableMenuItem;
import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.ProjectData.LanguageName;
import javax.swing.*;

2
src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java
View File

@@ -2,7 +2,7 @@ package _VisualDVM.Visual.Menus.MainMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenu;
public class AnalysesMenu extends VisualiserMenu {
public AnalysesMenu() {
super("Анализаторы", "/icons/Analyses.png");

2
src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Menus.MainMenuBar;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenu;
public class GlobalCleaningMenu extends VisualiserMenu {
public GlobalCleaningMenu() {
super("Очистка", "/icons/Clean.png", false);

2
src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
View File

@@ -4,7 +4,7 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.DBLastProject.DBLastProject;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenu;
import javax.swing.*;
import javax.swing.event.MenuEvent;

2
src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
View File

@@ -6,7 +6,7 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
import _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu.VisualiserSettingsMenu;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.UI;
import javax.swing.*;

2
src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java
View File

@@ -3,7 +3,7 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Visual.Menus.PassesSubMenu;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenu;
public class TransformationsMenu extends VisualiserMenu {
public TransformationsMenu() {
super("Преобразования", "/icons/Transformations.png");

2
src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
View File

@@ -4,7 +4,7 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Visual.Menus.PropertiesSubmenu;
import _VisualDVM.Visual.Menus.SettingsSubmenu;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenu;
public class VisualiserSettingsMenu extends VisualiserMenu {
public VisualiserSettingsMenu() {
super("Настройки визуализатора", "/icons/Settings.png");

2
src/_VisualDVM/Visual/Menus/ProjectMenuBar/FilesOperationsMenu.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Menus.ProjectMenuBar;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenu;
public class FilesOperationsMenu extends VisualiserMenu {
public FilesOperationsMenu() {
super("Массовые операции над файлами", "/icons/MassFiles.png");

2
src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Menus.ProjectMenuBar;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.UI;
import javax.swing.*;

2
src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java
View File

@@ -6,7 +6,7 @@ import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Visual.Menus.LanguagesSubmenu;
import _VisualDVM.Visual.Menus.SettingsSubmenu;
import _VisualDVM.Visual.Menus.StylesSubmenu;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenu;
import javax.swing.*;
public class ProjectSettingsMenu extends VisualiserMenu {

3
src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
View File

@@ -2,11 +2,10 @@ package _VisualDVM.Visual.Menus.ProjectMenuBar;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Visual.UI;
import javax.swing.*;

1
src/_VisualDVM/Visual/Menus/StylesSubmenu.java
View File

@@ -1,5 +1,6 @@
package _VisualDVM.Visual.Menus;
import Common.Visual.Controls.StableMenuItem;
import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.ProjectData.Files.LanguageStyle;
import javax.swing.*;

1
src/_VisualDVM/Visual/Menus/TypesSubmenu.java
View File

@@ -1,5 +1,6 @@
package _VisualDVM.Visual.Menus;
import Common.Visual.Controls.StableMenuItem;
import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.ProjectData.Files.FileType;
import javax.swing.*;

2
src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Menus.VersionsMenuBar;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Menus.VisualiserMenuBar;
public class VersionsMenuBar extends VisualiserMenuBar {
public VersionsMenuBar() {
addPasses(PassCode.CreateTestsGroupFromSelectedVersions);

40
src/_VisualDVM/Visual/UI.java
View File

@@ -127,46 +127,6 @@ public class UI {
testingBar = new TestingBar();
credentialsBar = new CredentialsBar();
versionsMenuBar = new VersionsMenuBar();
//---------------------------------------------------->>
UI_.menuBars.put(BugReportsDBTable.class, new BugReportsMenuBar());
UI_.menuBars.put(SubscriberWorkspaceDBTable.class, new SubscriberWorkspacesMenuBar());
//---------------------------------------------------->>
UI_.menuBars.put(GroupsDBTable.class, new GroupsMenuBar());
UI_.menuBars.put(TestDBTable.class, new TestsMenuBar());
UI_.menuBars.put(DVMConfigurationDBTable.class, new DVMConfigurationsMenuBar());
UI_.menuBars.put(DVMPackageDBTable.class, new DVMPackagesBar());
UI_.menuBars.put(SapforPackageDBTable.class, new SapforPackagesBar());
UI_.menuBars.put(DVMRunTasksSet.class, new DVMRunTasksBar());
//--->>>
UI_.menuBars.put(MachinesDBTable.class, new MachinesMenuBar());
UI_.menuBars.put(UsersDBTable.class, new UsersMenuBar());
UI_.menuBars.put(CompilersDBTable.class, new CompilersMenuBar());
UI_.menuBars.put(MakefilesDBTable.class, new MakefilesMenuBar());
UI_.menuBars.put(ModulesDBTable.class, new ModulesMenuBar());
UI_.menuBars.put(RunConfigurationsDBTable.class, new RunConfigurationsMenuBar());
UI_.menuBars.put(EnvironmentValuesDBTable.class, new EnvironmentValuesMenuBar());
UI_.menuBars.put(DVMParameterDBTable.class, new DVMParametersMenuBar());
UI_.menuBars.put(CompilationTasksDBTable.class, new DataMenuBar("задачи на компиляцию"));
UI_.menuBars.put(RunTasksDBTable.class, new DataMenuBar("задачи на запуск"));
//---->>
UI_.menuBars.put(SapforConfigurationDBTable.class, new SapforConfigurationsMenuBar());
//---->>
UI_.menuBars.put(RegionsSet.class, new DataMenuBar("области распараллеливания"));
UI_.menuBars.put(ArraysSet.class, new DataMenuBar("массивы"));
UI_.menuBars.put(ArraysDBTable.class, new DataMenuBar("сохранённые состояния") {
@Override
public void createSelectionButtons(DataSet dataSet) {
//не нужны.
}
});
UI_.menuBars.put(VariantsSet.class, new VariantsMenuBar());
UI_.menuBars.put(SubsribersDBTable.class, new SubscribersMenuBar());
UI_.menuBars.put(SapforProfilesDBTable.class, new DataMenuBar("профили", PassCode.SaveProfile, PassCode.EditProfile, PassCode.ApplyProfile, PassCode.DeleteProfile));
UI_.menuBars.put(ServerSapforsDBTable.class, new ServerSapforsBar());
UI_.menuBars.put(SapforSettingsDBTable.class, new SapforSettingsBar());
UI_.menuBars.put(SapforSettingsCommandsDBTable.class, new SapforSettingsCommandsBar());
UI_.menuBars.put(DVMSettingsDBTable.class, new DVMSettingsBar());
//---->>
}
public static void CreateWindows() {
searchReplaceWindow = new SearchReplaceForm();

2
src/_VisualDVM/Visual/Windows/CallbackForm.java
View File

@@ -14,7 +14,7 @@ import _VisualDVM.Visual.Interface.CallbackWindow;
import _VisualDVM.Visual.Interface.CommentInterface;
import _VisualDVM.Visual.Interface.DescriptionInterface;
import _VisualDVM.Visual.Interface.FormWithSplitters;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.UI;
import javax.swing.*;

2
src/_VisualDVM/Visual/Windows/CommentFields.java
View File

@@ -2,7 +2,7 @@ package _VisualDVM.Visual.Windows;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Interface.CommentInterface;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Menus.VisualiserMenuBar;
import javax.swing.*;
public class CommentFields implements CommentInterface {

2
src/_VisualDVM/Visual/Windows/ComparisonForm.java
View File

@@ -10,7 +10,7 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Editor.BaseEditor;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;

2
src/_VisualDVM/Visual/Windows/DescriptionFields.java
View File

@@ -2,7 +2,7 @@ package _VisualDVM.Visual.Windows;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Interface.DescriptionInterface;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Menus.VisualiserMenuBar;
import javax.swing.*;
public class DescriptionFields implements DescriptionInterface {

2
src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
View File

@@ -10,7 +10,7 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTasksPackageTree;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.UI;
import javax.swing.*;