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-13 23:55:03 +03:00
parent 6afa2dc892
commit 4e86871571
150 changed files with 510 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ public class AttachementsMenu extends StyledPopupMenu {
JMenuItem mscreenshot;
JMenuItem mExplorer;
public AttachementsMenu() {
add(mscreenshot = Pass.passes.get(PassCode.MakeScreenShot).createMenuItem());
add(mscreenshot = Global.mainModule.getPass(PassCode.MakeScreenShot).createMenuItem());
addSeparator();
mExplorer = new VisualiserMenuItem("Открыть вложения в проводнике...", "/icons/Explorer.png");
mExplorer.addActionListener(

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

@@ -21,7 +21,7 @@ public class CredentialsBar extends VisualiserMenuBar {
addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass.passes.get(PassCode.UpdateProperty).Do("collapseCredentials", false);
Global.mainModule.getPass(PassCode.UpdateProperty).Do("collapseCredentials", false);
}
});
}

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

@@ -42,7 +42,7 @@ public class MainEditorMenu extends TextEditorMenu {
m_gotoHeader.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass.passes.get(PassCode.OpenCurrentFile).Do(header);
Global.mainModule.getPass(PassCode.OpenCurrentFile).Do(header);
}
});
add(m_gotoHeader);
@@ -61,7 +61,7 @@ public class MainEditorMenu extends TextEditorMenu {
new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Pass.passes.get(PassCode.SPF_InlineProcedure).Do(call);
Global.mainModule.getPass(PassCode.SPF_InlineProcedure).Do(call);
}
});
add(m_inline);
@@ -71,7 +71,7 @@ public class MainEditorMenu extends TextEditorMenu {
new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Pass.passes.get(PassCode.SPF_LoopUnionCurrent).Do();
Global.mainModule.getPass(PassCode.SPF_LoopUnionCurrent).Do();
}
});
add(m_loop_union);
@@ -81,7 +81,7 @@ public class MainEditorMenu extends TextEditorMenu {
@Override
public void actionPerformed(ActionEvent e) {
try {
Pass.passes.get(PassCode.SPF_ChangeSpfIntervals).Do(
Global.mainModule.getPass(PassCode.SPF_ChangeSpfIntervals).Do(
((RSyntaxTextArea) editor).getLineOfOffset(editor.getSelectionStart()) + 1,
((RSyntaxTextArea) editor).getLineOfOffset(editor.getSelectionEnd()) + 1,
1
@@ -98,7 +98,7 @@ public class MainEditorMenu extends TextEditorMenu {
@Override
public void actionPerformed(ActionEvent e) {
try {
Pass.passes.get(PassCode.SPF_ChangeSpfIntervals).Do(
Global.mainModule.getPass(PassCode.SPF_ChangeSpfIntervals).Do(
((RSyntaxTextArea) editor).getLineOfOffset(editor.getSelectionStart()) + 1,
((RSyntaxTextArea) editor).getLineOfOffset(editor.getSelectionEnd()) + 1,
0
@@ -230,7 +230,7 @@ public class MainEditorMenu extends TextEditorMenu {
m_gotoFunction.setToolTipText(tip);
return;
}
if (!Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
if (! Global.mainModule.getPass(PassCode.SPF_GetGraphFunctions).isDone()) {
m_inline.setText("Невозможно подставить вызов процедуры " + Utils_.Brackets(selectedText) +
" . Выполните проход \"Граф процедур \".");
m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + Utils_.Brackets(selectedText) +
@@ -278,7 +278,7 @@ public class MainEditorMenu extends TextEditorMenu {
m_gotoHeader.setText("Невозможно перейти к заголовочному файлу. В текущей строке не найдено включений.");
return;
}
if (!Pass.passes.get(PassCode.SPF_GetIncludeDependencies).isDone()) {
if (! Global.mainModule.getPass(PassCode.SPF_GetIncludeDependencies).isDone()) {
m_gotoHeader.setText("Невозможно перейти к заголовочному файлу. Выполните проход \"Поиск зависимостей по включению\"");
return;
}
@@ -294,7 +294,7 @@ public class MainEditorMenu extends TextEditorMenu {
private void checkLoop() {
loop = null;
m_loop_union.setEnabled(false);
if (!Pass.passes.get(PassCode.SPF_GetGraphLoops).isDone()) {
if (! Global.mainModule.getPass(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;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Visual.Menus.VisualiserMenu;
public class AnalysesMenu extends VisualiserMenu {
public AnalysesMenu() {
super("Анализаторы","/icons/Analyses.png" );
for (PassCode code : Sapfor.getAnalysesCodes())
add(Pass.passes.get(code).createMenuItem());
add( Global.mainModule.getPass(code).createMenuItem());
addSeparator();
add(Pass.passes.get(PassCode.SPF_GetGCovInfo).createMenuItem());
add( Global.mainModule.getPass(PassCode.SPF_GetGCovInfo).createMenuItem());
}
}

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

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

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

@@ -30,7 +30,7 @@ public class LastOpenedProjectsMenu extends VisualiserMenu {
i.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Pass.passes.get(PassCode.OpenCurrentProject).Do(new File(p.HomePath));
Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(new File(p.HomePath));
}
});
add(i);

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

@@ -32,7 +32,7 @@ public class MainMenuBar extends VisualiserMenuBar {
if (PerformanceAnalyzer.isActive) {
UI_.Info("Перед работой с компонентами закройте анализатор производительности!");
} else {
Pass.passes.get(PassCode.GetComponentsActualVersions).Do();
Global.mainModule.getPass(PassCode.GetComponentsActualVersions).Do();
Global.RefreshUpdatesStatus();
UI.ShowComponentsWindow();
}
@@ -61,7 +61,7 @@ public class MainMenuBar extends VisualiserMenuBar {
setIcon("/icons/Apply.png");
setToolTipText("Test");
addActionListener(e -> {
Pass.passes.get(PassCode.TestPass).Do();
Global.mainModule.getPass(PassCode.TestPass).Do();
});
}
});
@@ -77,11 +77,11 @@ public class MainMenuBar extends VisualiserMenuBar {
analyses.setEnabled(flag);
transformations.setEnabled(flag);
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)
Global.mainModule.getPass(PassCode.DropAnalyses),
Global.mainModule.getPass(PassCode.DropSavedArrays),
Global.mainModule.getPass(PassCode.CleanAnalyses),
Global.mainModule.getPass(PassCode.DeleteDebugResults),
Global.mainModule.getPass(PassCode.ResetCurrentProject)
};
for (Pass pass : cleaningPasses) {
pass.setControlsEnabled(flag);

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

@@ -1,9 +1,9 @@
package _VisualDVM.Visual.Menus.MainMenuBar;
import Visual_DVM_2021.Passes.PassCode;
import _VisualDVM.Global;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Visual.Menus.PassesSubMenu;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import Visual_DVM_2021.Passes.PassCode;
import Common.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.passes.get(PassCode.SPF_SharedMemoryParallelization).createMenuItem());
add( Global.mainModule.getPass(PassCode.SPF_SharedMemoryParallelization).createMenuItem());
addSeparator();
add(new PassesSubMenu("Предобработка проекта", "/icons/Menu/Preprocessing.png",
Sapfor.getPreparationTransformationsCodes()

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

@@ -4,6 +4,7 @@ import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Global;
import javax.swing.*;
public class PassesSubMenu extends JMenu {
@@ -12,7 +13,7 @@ public class PassesSubMenu extends JMenu {
setIcon(Utils_.getIcon(icon));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
for (PassCode code : passes) {
add(Pass.passes.get(code).createMenuItem());
add( Global.mainModule.getPass(code).createMenuItem());
}
}
}

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

@@ -51,7 +51,7 @@ public class ProjectFilesMenu extends GraphMenu {
addActionListener(e -> {
if (Global.mainModule.HasProject()) {
UI.getVersionsWindow().getVersionsForm().getTree().SelectNode(Global.mainModule.getProject().node);
Pass.passes.get(PassCode.DeleteVersion).Do();
Global.mainModule.getPass(PassCode.DeleteVersion).Do();
}
});
}
@@ -86,29 +86,29 @@ public class ProjectFilesMenu extends GraphMenu {
add(mLanguage = new LanguagesSubmenu(PassCode.SetSelectedFilesLanguage.getDescription()) {
@Override
public void action(LanguageName languageName) {
Pass.passes.get(PassCode.SetSelectedFilesLanguage).Do(languageName);
Global.mainModule.getPass(PassCode.SetSelectedFilesLanguage).Do(languageName);
}
});
add(mStyle = new StylesSubmenu(PassCode.SetSelectedFilesStyle.getDescription()) {
@Override
public void action(LanguageStyle languageStyle) {
Pass.passes.get(PassCode.SetSelectedFilesStyle).Do(languageStyle);
Global.mainModule.getPass(PassCode.SetSelectedFilesStyle).Do(languageStyle);
}
});
add(mType = new TypesSubmenu(PassCode.SetSelectedFilesType.getDescription()) {
@Override
public void action(FileType fileType) {
Pass.passes.get(PassCode.SetSelectedFilesType).Do(fileType);
Global.mainModule.getPass(PassCode.SetSelectedFilesType).Do(fileType);
}
});
//--------------------------------------------------
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());
add( Global.mainModule.getPass(PassCode.ExcludeSelectedFiles).createMenuItem());
add( Global.mainModule.getPass(PassCode.IncludeSelectedFiles).createMenuItem());
add( Global.mainModule.getPass(PassCode.ExcludeFile).createMenuItem());
add( Global.mainModule.getPass(PassCode.IncludeFile).createMenuItem());
add( Global.mainModule.getPass(PassCode.DeleteFile).createMenuItem());
add( Global.mainModule.getPass(PassCode.DeleteDirectory).createMenuItem());
add( Global.mainModule.getPass(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.passes.get(PassCode.ExcludeFile).setControlsVisible(!Global.files_multiselection);
Pass.passes.get(PassCode.IncludeFile).setControlsVisible(!Global.files_multiselection);
Global.mainModule.getPass(PassCode.ExcludeFile).setControlsVisible(!Global.files_multiselection);
Global.mainModule.getPass(PassCode.IncludeFile).setControlsVisible(!Global.files_multiselection);
//-
Pass.passes.get(PassCode.DeleteFile).setControlsVisible(!Global.files_multiselection);
Pass.passes.get(PassCode.DeleteDirectory).setControlsVisible(!Global.files_multiselection);
Global.mainModule.getPass(PassCode.DeleteFile).setControlsVisible(!Global.files_multiselection);
Global.mainModule.getPass(PassCode.DeleteDirectory).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);
Global.mainModule.getPass(PassCode.ExcludeSelectedFiles).setControlsVisible(Global.files_multiselection);
Global.mainModule.getPass(PassCode.IncludeSelectedFiles).setControlsVisible(Global.files_multiselection);
Global.mainModule.getPass(PassCode.DeleteSelectedFiles).setControlsVisible(Global.files_multiselection);
}
}

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

@@ -13,8 +13,8 @@ public class VersionsMenu extends GraphMenu<DataTree> {
VisualiserMenuItem m_multiselection;
public VersionsMenu(DataTree tree) {
super(tree, "подверсии");
add(Pass.passes.get(PassCode.DeleteSubversions).createMenuItem());
add(Pass.passes.get(PassCode.DeleteLonelyM).createMenuItem());
add( Global.mainModule.getPass(PassCode.DeleteSubversions).createMenuItem());
add( Global.mainModule.getPass(PassCode.DeleteLonelyM).createMenuItem());
addSeparator();
m_multiselection = new VisualiserMenuItem("Массовый режим работы с версиями");
m_multiselection.setIcon(Utils_.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.passes.get(PassCode.DeleteVersion).createMenuItem());
add( Global.mainModule.getPass(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.passes.get(PassCode.DeleteSelectedVersions).createMenuItem());
add( Global.mainModule.getPass(PassCode.DeleteSelectedVersions).createMenuItem());
}
@Override
public void CheckElementsVisibility() {
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);
Global.mainModule.getPass(PassCode.DeleteSelectedVersions).setControlsVisible(!Global.versions_multiselection);
Global.mainModule.getPass(PassCode.DeleteSelectedVersions).setControlsVisible(Global.versions_multiselection);
Global.mainModule.getPass(PassCode.DeleteVersion).setControlsVisible(!Global.versions_multiselection);
m_select_all.setVisible(Global.versions_multiselection);
m_unselect_all.setVisible(Global.versions_multiselection);
}

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

@@ -1,9 +1,9 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Global;
import javax.swing.*;
import java.awt.*;
@@ -22,6 +22,6 @@ public class VisualiserMenu extends JMenu {
}
public void addPasses(PassCode... codes) {
for (PassCode code : codes)
add(Pass.passes.get(code).createMenuItem());
add( Global.mainModule.getPass(code).createMenuItem());
}
}

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

@@ -1,9 +1,9 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Global;
import javax.swing.*;
import java.awt.*;
@@ -15,8 +15,11 @@ public class VisualiserMenuBar extends JToolBar {
}
public void addPasses(PassCode... codes) {
//- кнопки. связать их с проходами. (!)
for (PassCode code : codes)
add(Pass.passes.get(code).createButton());
for (PassCode code : codes) {
if (Global.mainModule.getPass(code) != null) {
add(Global.mainModule.getPass(code).createButton());
}
}
}
public JMenuBar addMenus(JMenu... menus) {
JMenuBar bar = new JMenuBar() {