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-09 23:37:58 +03:00
parent eb278676cc
commit d1ffab1e70
299 changed files with 1844 additions and 1539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/_VisualDVM/Visual/Menus/AttachementsMenu.java
View File

@@ -3,8 +3,8 @@ import Common.Utils.CommonUtils;
import Common.Visual.Menus.StyledPopupMenu;
import Common.Visual.Menus.VisualiserMenuItem;
import _VisualDVM.Current;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import java.awt.*;
@@ -13,7 +13,7 @@ public class AttachementsMenu extends StyledPopupMenu {
JMenuItem mscreenshot;
JMenuItem mExplorer;
public AttachementsMenu() {
add(mscreenshot = Pass_2021.passes.get(PassCode_2021.MakeScreenShot).createMenuItem());
add(mscreenshot = Pass.passes.get(PassCode.MakeScreenShot).createMenuItem());
addSeparator();
mExplorer = new VisualiserMenuItem("Открыть вложения в проводнике...", "/icons/Explorer.png");
mExplorer.addActionListener(

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

@@ -3,8 +3,8 @@ import _VisualDVM.Current;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -20,7 +20,7 @@ public class CredentialsBar extends VisualiserMenuBar {
addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021.passes.get(PassCode_2021.UpdateProperty).Do("collapseCredentials", false);
Pass.passes.get(PassCode.UpdateProperty).Do("collapseCredentials", false);
}
});
}

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

@@ -4,14 +4,14 @@ import Common.Visual.CommonUI;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import java.awt.*;
import java.util.LinkedHashMap;
public class FastAccessMenuBar extends VisualiserMenuBar {
LinkedHashMap<PassCode_2021, JButton> passesButtons = new LinkedHashMap<>();
LinkedHashMap<PassCode, JButton> passesButtons = new LinkedHashMap<>();
public FastAccessMenuBar() {
Refresh();
}
@@ -19,7 +19,7 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
public void setSizeLimits() {
//если задавать PreffredSize 0, скролл НЕ РАБОТАЕТ. Магия!
}
public void showPass(Pass_2021 pass) {
public void showPass(Pass pass) {
JButton button = null;
if (passesButtons.containsKey(pass.code()))
button = passesButtons.get((pass.code()));
@@ -36,7 +36,7 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
public void Refresh() {
CommonUI.Clear(this);
int i = 1;
for (Pass_2021 pass : Pass_2021.FAPasses) {
for (Pass pass : Pass.FAPasses) {
if (pass.stats.HasUsages()) {
showPass(pass);
++i;

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

@@ -3,7 +3,7 @@ import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javax.swing.*;
import java.awt.*;
@@ -22,7 +22,7 @@ public class FileMenuBar extends VisualiserMenuBar {
addActionListener(e -> UI.ShowSearchForm());
}
});
addPasses(PassCode_2021.Save);
addPasses(PassCode.Save);
add(new MenuBarButton() {
{
setToolTipText("Увеличить шрифт(Ctrl+'+')");

20
src/_VisualDVM/Visual/Menus/MainEditorMenu.java
View File

@@ -11,8 +11,8 @@ import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
import _VisualDVM.ProjectData.SapforData.Loops.Loop;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import javax.swing.*;
@@ -41,7 +41,7 @@ public class MainEditorMenu extends TextEditorMenu {
m_gotoHeader.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021.passes.get(PassCode_2021.OpenCurrentFile).Do(header);
Pass.passes.get(PassCode.OpenCurrentFile).Do(header);
}
});
add(m_gotoHeader);
@@ -60,7 +60,7 @@ public class MainEditorMenu extends TextEditorMenu {
new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021.passes.get(PassCode_2021.SPF_InlineProcedure).Do(call);
Pass.passes.get(PassCode.SPF_InlineProcedure).Do(call);
}
});
add(m_inline);
@@ -70,7 +70,7 @@ public class MainEditorMenu extends TextEditorMenu {
new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021.passes.get(PassCode_2021.SPF_LoopUnionCurrent).Do();
Pass.passes.get(PassCode.SPF_LoopUnionCurrent).Do();
}
});
add(m_loop_union);
@@ -80,7 +80,7 @@ public class MainEditorMenu extends TextEditorMenu {
@Override
public void actionPerformed(ActionEvent e) {
try {
Pass_2021.passes.get(PassCode_2021.SPF_ChangeSpfIntervals).Do(
Pass.passes.get(PassCode.SPF_ChangeSpfIntervals).Do(
((RSyntaxTextArea) editor).getLineOfOffset(editor.getSelectionStart()) + 1,
((RSyntaxTextArea) editor).getLineOfOffset(editor.getSelectionEnd()) + 1,
1
@@ -97,7 +97,7 @@ public class MainEditorMenu extends TextEditorMenu {
@Override
public void actionPerformed(ActionEvent e) {
try {
Pass_2021.passes.get(PassCode_2021.SPF_ChangeSpfIntervals).Do(
Pass.passes.get(PassCode.SPF_ChangeSpfIntervals).Do(
((RSyntaxTextArea) editor).getLineOfOffset(editor.getSelectionStart()) + 1,
((RSyntaxTextArea) editor).getLineOfOffset(editor.getSelectionEnd()) + 1,
0
@@ -229,7 +229,7 @@ public class MainEditorMenu extends TextEditorMenu {
m_gotoFunction.setToolTipText(tip);
return;
}
if (!Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctions).isDone()) {
if (!Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
" . Выполните проход \"Граф процедур \".");
m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
@@ -277,7 +277,7 @@ public class MainEditorMenu extends TextEditorMenu {
m_gotoHeader.setText("Невозможно перейти к заголовочному файлу. В текущей строке не найдено включений.");
return;
}
if (!Pass_2021.passes.get(PassCode_2021.SPF_GetIncludeDependencies).isDone()) {
if (!Pass.passes.get(PassCode.SPF_GetIncludeDependencies).isDone()) {
m_gotoHeader.setText("Невозможно перейти к заголовочному файлу. Выполните проход \"Поиск зависимостей по включению\"");
return;
}
@@ -293,7 +293,7 @@ public class MainEditorMenu extends TextEditorMenu {
private void checkLoop() {
loop = null;
m_loop_union.setEnabled(false);
if (!Pass_2021.passes.get(PassCode_2021.SPF_GetGraphLoops).isDone()) {
if (!Pass.passes.get(PassCode.SPF_GetGraphLoops).isDone()) {
m_loop_union.setText("Невозможно объединить цикл в текущей строке со следующим. " +
"Выполните проход \"Граф циклов\"");
return;

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

@@ -1,14 +1,14 @@
package _VisualDVM.Visual.Menus.MainMenuBar;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class AnalysesMenu extends VisualiserMenu {
public AnalysesMenu() {
super("Анализаторы","/icons/Analyses.png" );
for (PassCode_2021 code : Sapfor.getAnalysesCodes())
add(Pass_2021.passes.get(code).createMenuItem());
for (PassCode code : Sapfor.getAnalysesCodes())
add(Pass.passes.get(code).createMenuItem());
addSeparator();
add(Pass_2021.passes.get(PassCode_2021.SPF_GetGCovInfo).createMenuItem());
add(Pass.passes.get(PassCode.SPF_GetGCovInfo).createMenuItem());
}
}

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

@@ -1,20 +1,20 @@
package _VisualDVM.Visual.Menus.MainMenuBar;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class GlobalCleaningMenu extends VisualiserMenu {
public GlobalCleaningMenu() {
super("Очистка", "/icons/Clean.png", false);
add(Pass_2021.passes.get(PassCode_2021.DropLastProjects).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.DropFastAccess).createMenuItem());
add(Pass.passes.get(PassCode.DropLastProjects).createMenuItem());
add(Pass.passes.get(PassCode.DropFastAccess).createMenuItem());
addSeparator();
add(Pass_2021.passes.get(PassCode_2021.DeleteDownloadedBugReports).createMenuItem());
add(Pass.passes.get(PassCode.DeleteDownloadedBugReports).createMenuItem());
addSeparator();
add(Pass_2021.passes.get(PassCode_2021.DropAnalyses).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.CleanAnalyses).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.DropSavedArrays).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.DeleteDebugResults).createMenuItem());
add(Pass.passes.get(PassCode.DropAnalyses).createMenuItem());
add(Pass.passes.get(PassCode.CleanAnalyses).createMenuItem());
add(Pass.passes.get(PassCode.DropSavedArrays).createMenuItem());
add(Pass.passes.get(PassCode.DeleteDebugResults).createMenuItem());
addSeparator();
add(Pass_2021.passes.get(PassCode_2021.ResetCurrentProject).createMenuItem());
add(Pass.passes.get(PassCode.ResetCurrentProject).createMenuItem());
}
}

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

@@ -5,8 +5,8 @@ import _VisualDVM.Visual.Menus.VisualiserMenu;
import _VisualDVM.GlobalData.DBLastProject.DBLastProject;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import javax.swing.event.MenuEvent;
@@ -29,7 +29,7 @@ public class LastOpenedProjectsMenu extends VisualiserMenu {
i.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021.passes.get(PassCode_2021.OpenCurrentProject).Do(new File(p.HomePath));
Pass.passes.get(PassCode.OpenCurrentProject).Do(new File(p.HomePath));
}
});
add(i);

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

@@ -6,8 +6,8 @@ import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu.VisualiserSettingsMenu;
import _VisualDVM.Visual.UI;
import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import java.awt.*;
@@ -17,7 +17,7 @@ public class MainMenuBar extends VisualiserMenuBar {
MenuBarButton components;
public MainMenuBar() {
addMenus(new LastOpenedProjectsMenu());
addPasses(PassCode_2021.OpenCurrentProject, PassCode_2021.CreateEmptyProject);
addPasses(PassCode.OpenCurrentProject, PassCode.CreateEmptyProject);
addMenus(
analyses = new AnalysesMenu(),
transformations = new TransformationsMenu(),
@@ -32,7 +32,7 @@ public class MainMenuBar extends VisualiserMenuBar {
if (PerformanceAnalyzer.isActive) {
CommonUI.Info("Перед работой с компонентами закройте анализатор производительности!");
} else {
Pass_2021.passes.get(PassCode_2021.GetComponentsActualVersions).Do();
Pass.passes.get(PassCode.GetComponentsActualVersions).Do();
Global.RefreshUpdatesStatus();
UI.ShowComponentsWindow();
}
@@ -50,7 +50,7 @@ public class MainMenuBar extends VisualiserMenuBar {
}
});
*/
addPasses(PassCode_2021.ShowInstruction);
addPasses(PassCode.ShowInstruction);
//-
setPreferredSize(new Dimension(0, 30));
//---
@@ -61,7 +61,7 @@ public class MainMenuBar extends VisualiserMenuBar {
setIcon("/icons/Apply.png");
setToolTipText("Test");
addActionListener(e -> {
Pass_2021.passes.get(PassCode_2021.TestPass).Do();
Pass.passes.get(PassCode.TestPass).Do();
});
}
});
@@ -76,14 +76,14 @@ public class MainMenuBar extends VisualiserMenuBar {
public void ShowProject(boolean flag) {
analyses.setEnabled(flag);
transformations.setEnabled(flag);
Pass_2021[] cleaningPasses = new Pass_2021[]{
Pass_2021.passes.get(PassCode_2021.DropAnalyses),
Pass_2021.passes.get(PassCode_2021.DropSavedArrays),
Pass_2021.passes.get(PassCode_2021.CleanAnalyses),
Pass_2021.passes.get(PassCode_2021.DeleteDebugResults),
Pass_2021.passes.get(PassCode_2021.ResetCurrentProject)
Pass[] cleaningPasses = new Pass[]{
Pass.passes.get(PassCode.DropAnalyses),
Pass.passes.get(PassCode.DropSavedArrays),
Pass.passes.get(PassCode.CleanAnalyses),
Pass.passes.get(PassCode.DeleteDebugResults),
Pass.passes.get(PassCode.ResetCurrentProject)
};
for (Pass_2021 pass : cleaningPasses) {
for (Pass pass : cleaningPasses) {
pass.setControlsEnabled(flag);
}
}

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

@@ -2,8 +2,8 @@ package _VisualDVM.Visual.Menus.MainMenuBar;
import _VisualDVM.Visual.Menus.PassesSubMenu;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class TransformationsMenu extends VisualiserMenu {
public TransformationsMenu() {
super("Преобразования", "/icons/Transformations.png");
@@ -27,7 +27,7 @@ public class TransformationsMenu extends VisualiserMenu {
Sapfor.getRegionsTransformationsCodes()
));
addSeparator();
add(Pass_2021.passes.get(PassCode_2021.SPF_SharedMemoryParallelization).createMenuItem());
add(Pass.passes.get(PassCode.SPF_SharedMemoryParallelization).createMenuItem());
addSeparator();
add(new PassesSubMenu("Предобработка проекта", "/icons/Menu/Preprocessing.png",
Sapfor.getPreparationTransformationsCodes()

4
src/_VisualDVM/Visual/Menus/PassMenuItem.java
View File

@@ -1,14 +1,14 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Visual.Menus.VisualiserMenuItem;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Pass;
import _VisualDVM.Visual.Controls.PassControl;
public class PassMenuItem extends VisualiserMenuItem implements PassControl {
@Override
public void setIcon(String icon_path) {
setIcon(CommonUtils.getIcon(icon_path));
}
public PassMenuItem(Pass_2021 pass) {
public PassMenuItem(Pass pass) {
setText(pass.getDescription());
setToolTipText(pass.getDescription());
if (pass.getIconPath() != null) setIcon(pass.getIconPath());

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

@@ -2,17 +2,17 @@ package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
public class PassesSubMenu extends JMenu {
public PassesSubMenu(String title, String icon, PassCode_2021... passes) {
public PassesSubMenu(String title, String icon, PassCode... passes) {
super(title);
setIcon(CommonUtils.getIcon(icon));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
for (PassCode_2021 code : passes) {
add(Pass_2021.passes.get(code).createMenuItem());
for (PassCode code : passes) {
add(Pass.passes.get(code).createMenuItem());
}
}
}

56
src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java
View File

@@ -8,8 +8,8 @@ import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.ProjectData.Files.LanguageStyle;
import _VisualDVM.ProjectData.LanguageName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import java.awt.*;
@@ -39,19 +39,19 @@ public class ProjectFilesMenu extends GraphMenu {
add(m);
addSeparator();
add(new PassesSubMenu("Добавить", "/icons/RedAdd.png",
PassCode_2021.AddFile,
PassCode_2021.CreateEmptyDirectory,
PassCode_2021.ImportFiles));
PassCode.AddFile,
PassCode.CreateEmptyDirectory,
PassCode.ImportFiles));
addSeparator();
add(new PassesSubMenu("Переименовать", "/icons/Menu/Rename.png",
PassCode_2021.RenameFile,
PassCode_2021.RenameDirectory));
PassCode.RenameFile,
PassCode.RenameDirectory));
add(new VisualiserMenuItem("Удалить текущий проект", "/icons/Delete.png") {
{
addActionListener(e -> {
if (Current.HasProject()) {
UI.getVersionsWindow().getVersionsForm().getTree().SelectNode(Current.getProject().node);
Pass_2021.passes.get(PassCode_2021.DeleteVersion).Do();
Pass.passes.get(PassCode.DeleteVersion).Do();
}
});
}
@@ -83,32 +83,32 @@ public class ProjectFilesMenu extends GraphMenu {
});
add(m_unselect_all);
//--------------------------------------------------
add(mLanguage = new LanguagesSubmenu(PassCode_2021.SetSelectedFilesLanguage.getDescription()) {
add(mLanguage = new LanguagesSubmenu(PassCode.SetSelectedFilesLanguage.getDescription()) {
@Override
public void action(LanguageName languageName) {
Pass_2021.passes.get(PassCode_2021.SetSelectedFilesLanguage).Do(languageName);
Pass.passes.get(PassCode.SetSelectedFilesLanguage).Do(languageName);
}
});
add(mStyle = new StylesSubmenu(PassCode_2021.SetSelectedFilesStyle.getDescription()) {
add(mStyle = new StylesSubmenu(PassCode.SetSelectedFilesStyle.getDescription()) {
@Override
public void action(LanguageStyle languageStyle) {
Pass_2021.passes.get(PassCode_2021.SetSelectedFilesStyle).Do(languageStyle);
Pass.passes.get(PassCode.SetSelectedFilesStyle).Do(languageStyle);
}
});
add(mType = new TypesSubmenu(PassCode_2021.SetSelectedFilesType.getDescription()) {
add(mType = new TypesSubmenu(PassCode.SetSelectedFilesType.getDescription()) {
@Override
public void action(FileType fileType) {
Pass_2021.passes.get(PassCode_2021.SetSelectedFilesType).Do(fileType);
Pass.passes.get(PassCode.SetSelectedFilesType).Do(fileType);
}
});
//--------------------------------------------------
add(Pass_2021.passes.get(PassCode_2021.ExcludeSelectedFiles).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.IncludeSelectedFiles).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.ExcludeFile).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.IncludeFile).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.DeleteFile).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.DeleteDirectory).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.DeleteSelectedFiles).createMenuItem());
add(Pass.passes.get(PassCode.ExcludeSelectedFiles).createMenuItem());
add(Pass.passes.get(PassCode.IncludeSelectedFiles).createMenuItem());
add(Pass.passes.get(PassCode.ExcludeFile).createMenuItem());
add(Pass.passes.get(PassCode.IncludeFile).createMenuItem());
add(Pass.passes.get(PassCode.DeleteFile).createMenuItem());
add(Pass.passes.get(PassCode.DeleteDirectory).createMenuItem());
add(Pass.passes.get(PassCode.DeleteSelectedFiles).createMenuItem());
}
@Override
public void CheckElementsVisibility() {
@@ -118,15 +118,15 @@ public class ProjectFilesMenu extends GraphMenu {
mStyle.setVisible(Global.files_multiselection);
mType.setVisible(Global.files_multiselection);
//-
Pass_2021.passes.get(PassCode_2021.ExcludeFile).setControlsVisible(!Global.files_multiselection);
Pass_2021.passes.get(PassCode_2021.IncludeFile).setControlsVisible(!Global.files_multiselection);
Pass.passes.get(PassCode.ExcludeFile).setControlsVisible(!Global.files_multiselection);
Pass.passes.get(PassCode.IncludeFile).setControlsVisible(!Global.files_multiselection);
//-
Pass_2021.passes.get(PassCode_2021.DeleteFile).setControlsVisible(!Global.files_multiselection);
Pass_2021.passes.get(PassCode_2021.DeleteDirectory).setControlsVisible(!Global.files_multiselection);
Pass.passes.get(PassCode.DeleteFile).setControlsVisible(!Global.files_multiselection);
Pass.passes.get(PassCode.DeleteDirectory).setControlsVisible(!Global.files_multiselection);
//--
Pass_2021.passes.get(PassCode_2021.ExcludeSelectedFiles).setControlsVisible(Global.files_multiselection);
Pass_2021.passes.get(PassCode_2021.IncludeSelectedFiles).setControlsVisible(Global.files_multiselection);
Pass_2021.passes.get(PassCode_2021.DeleteSelectedFiles).setControlsVisible(Global.files_multiselection);
Pass.passes.get(PassCode.ExcludeSelectedFiles).setControlsVisible(Global.files_multiselection);
Pass.passes.get(PassCode.IncludeSelectedFiles).setControlsVisible(Global.files_multiselection);
Pass.passes.get(PassCode.DeleteSelectedFiles).setControlsVisible(Global.files_multiselection);
}
}

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

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Menus.ProjectMenuBar;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
@@ -21,7 +21,7 @@ public class ProjectViewMenu extends VisualiserMenu {
setIcon(CommonUtils.getIcon(view.getIcon()));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
addActionListener(e -> {
CurrentAnchestor.set(Current.ProjectView, view);
Current_.set(Current.ProjectView, view);
UI.getMainWindow().getProjectWindow().ShowProjectView();
});
}

8
src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Menus;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.Menus.VisualiserMenuItem;
import Common.Visual.Selectable;
@@ -41,7 +41,7 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
m_select_for_current.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Object o = CurrentAnchestor.get(tree.getCurrent());
Object o = Current_.get(tree.getCurrent());
if (o instanceof Selectable) {
((Selectable) o).SelectAllChildren(true);
}
@@ -54,7 +54,7 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
m_unselect_for_current.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Object o = CurrentAnchestor.get(tree.getCurrent());
Object o = Current_.get(tree.getCurrent());
if (o instanceof Selectable) {
((Selectable) o).SelectAllChildren(false);
}
@@ -68,7 +68,7 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
public abstract void SelectAll(boolean select);
@Override
public void CheckElementsVisibility() {
Object current = CurrentAnchestor.get(tree.getCurrent());
Object current = Current_.get(tree.getCurrent());
if ((current != null) && (current.getClass().equals(getTargetClass()))) {
String name = ((Selectable) current).getSelectionText();
m_select_for_current.setText("Выбрать всё для " +

4
src/_VisualDVM/Visual/Menus/StablePassMenuItem.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Pass;
import _VisualDVM.Visual.Controls.PassControl;
public class StablePassMenuItem extends StableMenuItem implements PassControl {
@Override
public void setIcon(String icon_path) {
setIcon(CommonUtils.getIcon(icon_path));
}
public StablePassMenuItem(Pass_2021 pass) {
public StablePassMenuItem(Pass pass) {
setText(pass.getDescription());
setToolTipText(pass.getDescription());
if (pass.getIconPath() != null) setIcon(pass.getIconPath());

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

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

18
src/_VisualDVM/Visual/Menus/VersionsMenu.java
View File

@@ -5,16 +5,16 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import Common.Visual.Trees.DataTree;
import _VisualDVM.Visual.UI;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class VersionsMenu extends GraphMenu<DataTree> {
VisualiserMenuItem m_select_all;
VisualiserMenuItem m_unselect_all;
VisualiserMenuItem m_multiselection;
public VersionsMenu(DataTree tree) {
super(tree, "подверсии");
add(Pass_2021.passes.get(PassCode_2021.DeleteSubversions).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.DeleteLonelyM).createMenuItem());
add(Pass.passes.get(PassCode.DeleteSubversions).createMenuItem());
add(Pass.passes.get(PassCode.DeleteLonelyM).createMenuItem());
addSeparator();
m_multiselection = new VisualiserMenuItem("Массовый режим работы с версиями");
m_multiselection.setIcon(CommonUtils.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
@@ -26,7 +26,7 @@ public class VersionsMenu extends GraphMenu<DataTree> {
});
add(m_multiselection);
addSeparator();
add(Pass_2021.passes.get(PassCode_2021.DeleteVersion).createMenuItem());
add(Pass.passes.get(PassCode.DeleteVersion).createMenuItem());
//-
m_select_all = new StableMenuItem("Выбрать всё, кроме резервных копий","/icons/SelectAll.png");
m_select_all.addActionListener(e -> {
@@ -40,13 +40,13 @@ public class VersionsMenu extends GraphMenu<DataTree> {
tree.updateUI();
});
add(m_unselect_all);
add(Pass_2021.passes.get(PassCode_2021.DeleteSelectedVersions).createMenuItem());
add(Pass.passes.get(PassCode.DeleteSelectedVersions).createMenuItem());
}
@Override
public void CheckElementsVisibility() {
Pass_2021.passes.get(PassCode_2021.DeleteSelectedVersions).setControlsVisible(!Global.versions_multiselection);
Pass_2021.passes.get(PassCode_2021.DeleteSelectedVersions).setControlsVisible(Global.versions_multiselection);
Pass_2021.passes.get(PassCode_2021.DeleteVersion).setControlsVisible(!Global.versions_multiselection);
Pass.passes.get(PassCode.DeleteSelectedVersions).setControlsVisible(!Global.versions_multiselection);
Pass.passes.get(PassCode.DeleteSelectedVersions).setControlsVisible(Global.versions_multiselection);
Pass.passes.get(PassCode.DeleteVersion).setControlsVisible(!Global.versions_multiselection);
m_select_all.setVisible(Global.versions_multiselection);
m_unselect_all.setVisible(Global.versions_multiselection);
}

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

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

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

@@ -2,8 +2,8 @@ package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import java.awt.*;
@@ -20,8 +20,8 @@ public class VisualiserMenu extends JMenu {
public VisualiserMenu(String text, String iconPath) {
this(text, iconPath, false);
}
public void addPasses(PassCode_2021... codes) {
for (PassCode_2021 code : codes)
add(Pass_2021.passes.get(code).createMenuItem());
public void addPasses(PassCode... codes) {
for (PassCode code : codes)
add(Pass.passes.get(code).createMenuItem());
}
}

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

@@ -2,8 +2,8 @@ package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import java.awt.*;
@@ -13,10 +13,10 @@ public class VisualiserMenuBar extends JToolBar {
setFloatable(false);
setSizeLimits();
}
public void addPasses(PassCode_2021... codes) {
public void addPasses(PassCode... codes) {
//- кнопки. связать их с проходами. (!)
for (PassCode_2021 code : codes)
add(Pass_2021.passes.get(code).createButton());
for (PassCode code : codes)
add(Pass.passes.get(code).createButton());
}
public JMenuBar addMenus(JMenu... menus) {
JMenuBar bar = new JMenuBar() {