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-14 20:57:18 +03:00
parent 84acf05c19
commit 7f1d21a067
104 changed files with 204 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
.idea/workspace.xml generated
View File

@@ -7,56 +7,39 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesMenuBar.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/DBArraysMenuBar.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysMenuBar.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/MainModule_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/TabToolBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/TabToolBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetFilter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/DataMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/DataMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/UI_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UI_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ComponentsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/FilesOperationsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/FilesOperationsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StylesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StylesSubmenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/TypesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/TypesSubmenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CommentFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CommentFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DescriptionFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DescriptionFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

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

@@ -42,18 +42,32 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
}
protected void createFilters() {
}
public Class getMenuBarClass(){return null;}
public void mountUI(JPanel content_in) {
UI_.Clear(content_in);
//-->
ui_ = createUI();
ui_.setContent(content_in);
//-->
if (MainModule_.instance.getUI().menuBars.containsKey(getClass())) {
DataMenuBar bar = MainModule_.instance.getUI().menuBars.get(getClass());
content_in.add(bar, BorderLayout.NORTH);
setFilterUI(count -> MainModule_.instance.getUI().menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
if (ui_.hasCheckBox())
bar.createSelectionButtons(this);
if (getMenuBarClass()!=null){
try {
DataMenuBar bar = null;
if (!MainModule_.instance.getUI().menuBars.containsKey(getClass())) {
bar = (DataMenuBar) getMenuBarClass().newInstance();
MainModule_.instance.getUI().menuBars.put(getClass(), bar);
} else {
bar = MainModule_.instance.getUI().menuBars.get(getClass());
}
content_in.add(bar, BorderLayout.NORTH);
//--
setFilterUI(count -> MainModule_.instance.getUI().menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
if (ui_.hasCheckBox())
bar.createSelectionButtons(this);
//--
}
catch ( Exception ex){
ex.printStackTrace();
}
}
content_in.add(ui_.getDataPanel(), BorderLayout.CENTER);
//----

2
src/Common/Passes/Pass.java
View File

@@ -8,7 +8,7 @@ import Common.Visual.Controls.PassControl;
import Common.Visual.Controls.StablePassMenuItem;
import Common.Visual.UI_;
import Common.Visual.Windows.PassForm;
import _VisualDVM.Global; //избавиться когда мейн модуль станет обязательным
import _VisualDVM.Global;
import javax.swing.*;
import java.awt.event.ActionEvent;

1
src/Common/Visual/Controls/HyperlinksStyledList.java
View File

@@ -1,7 +1,6 @@
package Common.Visual.Controls;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
public class HyperlinksStyledList extends StyledList {
@Override
public void applyTheme() {

1
src/Common/Visual/Controls/MenuBarButton.java
View File

@@ -2,7 +2,6 @@ package Common.Visual.Controls;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import javax.swing.*;
import java.awt.*;

1
src/Common/Visual/Controls/StableMenuItem.java
View File

@@ -2,7 +2,6 @@ package Common.Visual.Controls;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Menus.VisualiserMenuItem;
import Common.Visual.UI_;
import javax.swing.*;
import javax.swing.plaf.ComponentUI;

1
src/Common/Visual/Controls/StyledList.java
View File

@@ -2,7 +2,6 @@ package Common.Visual.Controls;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_;
import javax.swing.*;
public class StyledList extends JList implements ThemeElement {

1
src/Common/Visual/Controls/StyledProgressBar.java
View File

@@ -1,7 +1,6 @@
package Common.Visual.Controls;
import Common.MainModule_;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_;
import javax.swing.*;
public class StyledProgressBar extends JProgressBar implements ThemeElement {

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 Common.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.awt.event.MouseAdapter;

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

@@ -15,6 +15,7 @@ public class DataMenuBar extends VisualiserMenuBar {
JButton unselectAllButton = null;
//-
public DataMenuBar(String dataName, PassCode... passes) {
System.out.println("create bar for "+dataName);
// Font font = Current.getTheme().Fonts.get(VisualiserFonts.TreeBoldItalic).deriveFont(12.0F);
add(new JLabel(dataName + " : "));
add(countLabel = new JLabel("?"));

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

@@ -1,7 +1,6 @@
package Common.Visual.Menus;
import Common.MainModule_;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_;
import javax.swing.*;
import javax.swing.event.PopupMenuEvent;

8
src/Common/Visual/Menus/VisualiserMenu.java
View File

@@ -3,9 +3,6 @@ import Common.MainModule_;
import Common.Passes.PassCode_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.awt.*;
@@ -15,11 +12,6 @@ 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));

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

@@ -2,7 +2,6 @@ package Common.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;

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

@@ -2,7 +2,6 @@ package Common.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import javax.swing.*;
public class VisualiserMenuItem extends JMenuItem {

1
src/Common/Visual/Tables/HiddenListRenderer.java
View File

@@ -1,7 +1,6 @@
package Common.Visual.Tables;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import javax.swing.*;
import java.util.Vector;

1
src/Common/Visual/Tables/StatusEnumRenderer.java
View File

@@ -1,7 +1,6 @@
package Common.Visual.Tables;
import Common.MainModule_;
import Common.Visual.StatusEnum;
import Common.Visual.UI_;
import javax.swing.*;
public class StatusEnumRenderer extends RendererCell<StatusEnum> {

1
src/Common/Visual/Tables/StyledCellLabel.java
View File

@@ -2,7 +2,6 @@ package Common.Visual.Tables;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_;
import javax.swing.*;
//наиболее распространенный случай. переотображение текста и/или изображения в ячейке таблицы.

1
src/Common/Visual/Tables/StyledTable.java
View File

@@ -3,7 +3,6 @@ import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.TableMenu;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_;
import javax.swing.*;
import javax.swing.table.*;

1
src/Common/Visual/Tables/WrapTextRenderer.java
View File

@@ -1,7 +1,6 @@
package Common.Visual.Tables;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import javax.swing.*;
import javax.swing.table.TableCellRenderer;

1
src/Common/Visual/Trees/GraphTreeCellRenderer.java
View File

@@ -2,7 +2,6 @@ package Common.Visual.Trees;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
import javax.swing.*;

1
src/Common/Visual/Trees/SelectionTreeCellRenderer.java
View File

@@ -2,7 +2,6 @@ package Common.Visual.Trees;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Selectable;
import Common.Visual.UI_;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;

1
src/Common/Visual/Trees/StyledTree.java
View File

@@ -2,7 +2,6 @@ package Common.Visual.Trees;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_;
import _VisualDVM.Visual.Menus.GraphMenu;
import _VisualDVM.Visual.UI;

1
src/Common/Visual/Trees/StyledTreeCellRenderer.java
View File

@@ -1,7 +1,6 @@
package Common.Visual.Trees;
import Common.MainModule_;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_;
import javax.swing.tree.DefaultTreeCellRenderer;
public class StyledTreeCellRenderer extends DefaultTreeCellRenderer implements ThemeElement {

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

@@ -1,15 +1,10 @@
package Common.Visual;
import Common.Database.Tables.DataSet;
import Common.Utils.Utils_;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Themes.DefaultTheme;
import Common.Visual.Themes.VisualiserTheme;
import javax.swing.*;
import javax.swing.event.ChangeListener;
import javax.swing.text.DefaultFormatter;
import java.awt.*;
import java.util.LinkedHashMap;
import java.util.Stack;
public class UI_ {
public static boolean active = false; //есть ли интерфейс. в консольных версиях не нужен.

1
src/Common/Visual/Windows/Dialog/DialogTextComboBox.java
View File

@@ -1,7 +1,6 @@
package Common.Visual.Windows.Dialog;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import javax.swing.*;
import java.awt.*;

1
src/Common/Visual/Windows/Dialog/DialogWrapText.java
View File

@@ -1,7 +1,6 @@
package Common.Visual.Windows.Dialog;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import javax.swing.*;
import java.awt.*;

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

@@ -157,4 +157,8 @@ public class CompilersDBTable extends iDBTable<Compiler> {
public Current CurrentName() {
return Current.Compiler;
}
@Override
public Class getMenuBarClass() {
return CompilersMenuBar.class;
}
}

1
src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.CompilerEnvironment.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.UI_;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
public class CompilerEnvironmentValueRenderer extends DBObjectRenderer {
@Override

1
src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.UI_;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
@Override

1
src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.UI_;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
@Override

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

@@ -95,4 +95,8 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
}
};
}
@Override
public Class getMenuBarClass() {
return DVMParametersMenuBar.class;
}
}

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

@@ -95,4 +95,8 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
if (environmentValue.name.equalsIgnoreCase(name_in)) return environmentValue;
return null;
}
@Override
public Class getMenuBarClass() {
return EnvironmentValuesMenuBar.class;
}
}

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

@@ -122,4 +122,8 @@ public class MachinesDBTable extends iDBTable<Machine> {
public boolean LocalMachineExists() {
return Data.values().stream().anyMatch(machine -> machine.type.equals(MachineType.Local));
}
@Override
public Class getMenuBarClass() {
return MachinesMenuBar.class;
}
}

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

@@ -70,4 +70,8 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
public Current CurrentName() {
return Current.Makefile;
}
@Override
public Class getMenuBarClass() {
return MakefilesMenuBar.class;
}
}

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

@@ -62,4 +62,8 @@ public class ModulesDBTable extends iDBTable<Module> {
public Current CurrentName() {
return Current.Module;
}
@Override
public Class getMenuBarClass() {
return ModulesMenuBar.class;
}
}

1
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.RemoteFile.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Trees.StyledTreeCellRenderer;
import Common.Visual.UI_;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import javax.swing.*;

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

@@ -166,4 +166,8 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
getDb().Update(c);
}
}
@Override
public Class getMenuBarClass() {
return RunConfigurationsMenuBar.class;
}
}

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

@@ -65,4 +65,8 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
res.put(SapforProfileSetting.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
return res;
}
@Override
public Class getMenuBarClass() {
return SapforProfilesMenuBar.class;
}
}

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

@@ -120,4 +120,8 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
public Current CurrentName() {
return Current.CompilationTask;
}
@Override
public Class getMenuBarClass() {
return CompilationTasksMenuBar.class;
}
}

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

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

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

@@ -85,4 +85,8 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
public Current CurrentName() {
return Current.RunTask;
}
@Override
public Class getMenuBarClass() {
return RunTasksMenuBar.class;
}
}

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

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

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

@@ -111,4 +111,8 @@ public class UsersDBTable extends iDBTable<User> {
public Current CurrentName() {
return Current.User;
}
@Override
public Class getMenuBarClass() {
return UsersMenuBar.class;
}
}

56
src/_VisualDVM/MainModule.java
View File

@@ -1,96 +1,40 @@
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;
import java.io.File;

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

@@ -46,4 +46,8 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
public Current CurrentName() {
return Current.DBArray;
}
@Override
public Class getMenuBarClass() {
return DBArraysMenuBar.class;
}
}

1
src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import _VisualDVM.Visual.UI;
import javax.swing.*;

1
src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.ProjectData.Files.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Trees.StyledTreeCellRenderer;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;

2
src/_VisualDVM/ProjectData/Messages/Message.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.ProjectData.Messages;
import _VisualDVM.Mode;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Mode;
import _VisualDVM.ProjectData.SapforData.FileObject;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;

1
src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java
View File

@@ -3,7 +3,6 @@ import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Selectable;
import Common.Visual.Trees.StyledTreeCellRenderer;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Project.db_project_info;

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

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

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

@@ -78,4 +78,8 @@ 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;
}
}

1
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.RendererCell;
import Common.Visual.UI_;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import javax.swing.*;

1
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.UI_;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import _VisualDVM.Visual.UI;

1
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Trees.StyledTreeCellRenderer;
import Common.Visual.UI_;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import javax.swing.*;

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

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

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

@@ -61,4 +61,8 @@ public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
public String[] getUIColumnNames() {
return new String[]{"Имя", "Строк кода", "Массивов", "Циклов", "Объявлений процедур", "Вызовов процедур", "Фрагменты"};
}
@Override
public Class getMenuBarClass() {
return RegionsMenuBar.class;
}
}

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

@@ -2,6 +2,7 @@ package _VisualDVM.ProjectData.SapforData.Variants;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.Visual.Menus.VariantsMenuBar.VariantsMenuBar;
import static Common.Visual.Tables.TableRenderers.*;
public class VariantsSet extends DataSet<String, ParallelVariant> {
@@ -70,4 +71,8 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
public Current CurrentName() {
return Current.ParallelVariant;
}
@Override
public Class getMenuBarClass() {
return VariantsMenuBar.class;
}
}

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

@@ -112,4 +112,8 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
public Vector<BugReport> getAllDrafts() throws Exception {
return Data.values().stream().filter(bugReport -> bugReport.state.equals(BugReportState.draft)).collect(Collectors.toCollection(Vector::new));
}
@Override
public Class getMenuBarClass() {
return BugReportsMenuBar.class;
}
}

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

@@ -2,6 +2,7 @@ package _VisualDVM.Repository.Component;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.Visual.Menus.ComponentsMenuBar;
import java.util.Vector;
@@ -85,4 +86,8 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
target.add(server);
return target;
}
@Override
public Class getMenuBarClass() {
return ComponentsMenuBar.class;
}
}

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

@@ -46,4 +46,8 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
}
return null;
}
@Override
public Class getMenuBarClass() {
return SubscriberWorkspacesMenuBar.class;
}
}

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

@@ -70,4 +70,8 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
res.put(SubscriberWorkspace.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
return res;
}
@Override
public Class getMenuBarClass() {
return SubscribersMenuBar.class;
}
}

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

@@ -145,4 +145,8 @@ public class GroupsDBTable extends iDBTable<Group> {
}
return null;
}
@Override
public Class getMenuBarClass() {
return GroupsMenuBar.class;
}
}

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 Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Passes.PassCode;
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 Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Passes.PassCode;
public class EditGroupMenu extends VisualiserMenu {
public EditGroupMenu() {
super("", "/icons/Edit.png");

6
src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java
View File

@@ -1,13 +1,9 @@
package _VisualDVM.TestingSystem.Common.MachineProcess;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import _VisualDVM.Mode;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.GlobalProperties;
import _VisualDVM.*;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.Utils;
import org.apache.commons.io.FileUtils;
import java.io.File;

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

@@ -124,4 +124,8 @@ public class TestDBTable extends iDBTable<Test> {
}
return selectedTests.isEmpty() ? allTests : selectedTests;
}
@Override
public Class getMenuBarClass() {
return TestsMenuBar.class;
}
}

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

@@ -1,7 +1,7 @@
package _VisualDVM.TestingSystem.Common.Test.UI;
import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
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 Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
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

@@ -3,10 +3,10 @@ import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.VisualiserMenuBar;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import Common.Visual.Menus.VisualiserMenuBar;
import javax.swing.*;
import java.awt.*;

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

@@ -114,4 +114,8 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
public boolean ShowEditObjectDialog(DBObject object) {
return (Global.mainModule.getAccount().CheckAccessRights(((DVMConfiguration) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
}
@Override
public Class getMenuBarClass() {
return DVMConfigurationsMenuBar.class;
}
}

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

@@ -122,4 +122,8 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
};
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public Class getMenuBarClass() {
return DVMPackagesBar.class;
}
}

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

@@ -5,6 +5,7 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsBar;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields;
public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
public DVMSettingsDBTable() {
@@ -144,4 +145,8 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
public boolean ShowEditObjectDialog(DBObject object) {
return (Global.mainModule.getAccount().CheckAccessRights(((DVMSettings) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
}
@Override
public Class getMenuBarClass() {
return DVMSettingsBar.class;
}
}

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

@@ -162,4 +162,8 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
};
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public Class getMenuBarClass() {
return DVMRunTasksBar.class;
}
}

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

@@ -127,4 +127,8 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
return sapforConfiguration;
return null;
}
@Override
public Class getMenuBarClass() {
return SapforConfigurationsMenuBar.class;
}
}

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

@@ -6,6 +6,7 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackagesBar;
import java.util.Comparator;
import java.util.Date;
@@ -100,4 +101,8 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
};
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public Class getMenuBarClass() {
return SapforPackagesBar.class;
}
}

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

@@ -115,4 +115,8 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
res.put(SapforSettingsCommand.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
return res;
}
@Override
public Class getMenuBarClass() {
return SapforSettingsBar.class;
}
}

1
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
import Common.MainModule_;
import Common.Visual.Tables.StyledCellLabel;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;

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

@@ -81,4 +81,8 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
}
return res;
}
@Override
public Class getMenuBarClass() {
return SapforSettingsCommandsBar.class;
}
}

6
src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
View File

@@ -1,10 +1,7 @@
package _VisualDVM.TestingSystem.SAPFOR;
import Common.CommonConstants;
import _VisualDVM.Mode;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.GlobalProperties;
import _VisualDVM.*;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Repository.EmailMessage;
@@ -17,7 +14,6 @@ import _VisualDVM.TestingSystem.SAPFOR.Json.SapforTestingSet_json;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
import _VisualDVM.Utils;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;

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

@@ -71,4 +71,8 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
};
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public Class getMenuBarClass() {
return ServerSapforsBar.class;
}
}

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

@@ -1,102 +1,8 @@
package _VisualDVM.Visual;
import Common.Visual.UIModule_;
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());
}
}

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

@@ -2,9 +2,9 @@ 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;
import Common.Visual.Menus.VisualiserMenu;
public class ComponentsMenuBar extends DataMenuBar {
public ComponentsMenuBar() {
super("компоненты");

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

@@ -1,9 +1,9 @@
package _VisualDVM.Visual.Menus.CredentialsBar;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
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

@@ -1,10 +1,10 @@
package _VisualDVM.Visual.Menus.FastAccessMenuBar;
import Common.MainModule_;
import Common.Passes.Pass;
import Common.Visual.Menus.VisualiserMenuBar;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import Common.Visual.Menus.VisualiserMenuBar;
import javax.swing.*;
import java.awt.*;

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

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

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

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Menus.FileMenuBar;
import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.ProjectData.Files.LanguageStyle;
@@ -6,7 +7,6 @@ import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Visual.Menus.LanguagesSubmenu;
import _VisualDVM.Visual.Menus.StylesSubmenu;
import _VisualDVM.Visual.Menus.TypesSubmenu;
import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Visual.UI;
import javax.swing.*;

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

@@ -1,8 +1,8 @@
package _VisualDVM.Visual.Menus.MainMenuBar;
import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
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 Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Passes.PassCode;
public class GlobalCleaningMenu extends VisualiserMenu {
public GlobalCleaningMenu() {
super("Очистка", "/icons/Clean.png", false);

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

@@ -1,10 +1,10 @@
package _VisualDVM.Visual.Menus.MainMenuBar;
import Common.Visual.Menus.VisualiserMenu;
import Common.Visual.Menus.VisualiserMenuItem;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.DBLastProject.DBLastProject;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import Common.Visual.Menus.VisualiserMenu;
import javax.swing.*;
import javax.swing.event.MenuEvent;

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

@@ -1,12 +1,12 @@
package _VisualDVM.Visual.Menus.MainMenuBar;
import Common.Passes.Pass;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Menus.VisualiserMenuBar;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
import _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu.VisualiserSettingsMenu;
import Common.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.UI;
import javax.swing.*;

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

@@ -1,9 +1,9 @@
package _VisualDVM.Visual.Menus.MainMenuBar;
import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Visual.Menus.PassesSubMenu;
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

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

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

@@ -2,7 +2,6 @@ package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;

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

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Menus.ProjectMenuBar;
import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.ProjectData.Files.LanguageStyle;
@@ -6,7 +7,6 @@ import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Visual.Menus.LanguagesSubmenu;
import _VisualDVM.Visual.Menus.SettingsSubmenu;
import _VisualDVM.Visual.Menus.StylesSubmenu;
import Common.Visual.Menus.VisualiserMenu;
import javax.swing.*;
public class ProjectSettingsMenu extends VisualiserMenu {

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

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

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

@@ -2,7 +2,6 @@ package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import _VisualDVM.Global;
import javax.swing.*;

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

@@ -2,7 +2,6 @@ package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;

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

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

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

@@ -1,89 +1,31 @@
package _VisualDVM.Visual;
import Common.Database.Tables.DataSet;
import Common.MainModule_;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.*;
import Common.Visual.Trees.GraphTreeCellRenderer;
import Common.Visual.Trees.SelectionTreeCellRenderer;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.CompilersDBTable;
import _VisualDVM.GlobalData.Compiler.CompilersMenuBar;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueEditor;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
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.RemoteFile.UI.RemoteFileChooser;
import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileRenderer;
import _VisualDVM.GlobalData.RunConfiguration.RunConfigurationsDBTable;
import _VisualDVM.GlobalData.RunConfiguration.RunConfigurationsMenuBar;
import _VisualDVM.GlobalData.SapforProfile.SapforProfilesDBTable;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTasksDBTable;
import _VisualDVM.GlobalData.User.UsersDBTable;
import _VisualDVM.GlobalData.User.UsersMenuBar;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.DBArray.ArraysDBTable;
import _VisualDVM.ProjectData.Files.UI.FilesTreeCellRenderer;
import _VisualDVM.ProjectData.Project.UI.VersionsTreeCellRenderer;
import _VisualDVM.ProjectData.SapforData.Arrays.ArraysSet;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionRenderer;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionStateChanger;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.RulesTreeCellRenderer;
import _VisualDVM.ProjectData.SapforData.Regions.RegionsSet;
import _VisualDVM.ProjectData.SapforData.Variants.UI.VariantRankRenderer;
import _VisualDVM.ProjectData.SapforData.Variants.VariantsSet;
import _VisualDVM.Repository.BugReport.BugReportsDBTable;
import _VisualDVM.Repository.BugReport.BugReportsMenuBar;
import _VisualDVM.Repository.Component.UI.ComponentsForm;
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.Common.TestingBar;
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.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsBar;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
import _VisualDVM.Visual.Interface.DebugWindow;
import _VisualDVM.Visual.Interface.VersionsWindow;
import _VisualDVM.Visual.Menus.CredentialsBar.CredentialsBar;
import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar;
import _VisualDVM.Visual.Menus.FileMenuBar.FileMenuBar;
import _VisualDVM.Visual.Menus.MainMenuBar.MainMenuBar;
import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
import _VisualDVM.Visual.Menus.VariantsMenuBar.VariantsMenuBar;
import _VisualDVM.Visual.Menus.VersionsMenuBar.VersionsMenuBar;
import _VisualDVM.Visual.Windows.*;

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

@@ -1,5 +1,6 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import Common.Visual.Menus.VisualiserMenuBar;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.UI_;
import _VisualDVM.Global;
@@ -14,7 +15,6 @@ import _VisualDVM.Visual.Interface.CallbackWindow;
import _VisualDVM.Visual.Interface.CommentInterface;
import _VisualDVM.Visual.Interface.DescriptionInterface;
import _VisualDVM.Visual.Interface.FormWithSplitters;
import Common.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.UI;
import javax.swing.*;

Some files were not shown because too many files have changed in this diff Show More