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/Controls/PassButton.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Visual.Controls;
import Common.Visual.Controls.MenuBarButton;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Pass;
import java.awt.*;
public class PassButton extends MenuBarButton implements PassControl {
public PassButton(Pass_2021 pass, boolean tab) {
public PassButton(Pass pass, boolean tab) {
setText(pass.getButtonText());
setToolTipText(pass.getDescription());
if (pass.getIconPath() != null) {
@@ -20,7 +20,7 @@ public class PassButton extends MenuBarButton implements PassControl {
addActionListener(pass.getControlAction());
pass.controls.add(this);
}
public PassButton(Pass_2021 pass) {
public PassButton(Pass pass) {
this(pass, false);
}
}

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

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

@@ -84,7 +84,7 @@ 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 Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import _VisualDVM.Visual.Interface.DebugWindow;
import _VisualDVM.Visual.Interface.VersionsWindow;
import _VisualDVM.Visual.Windows.DebugForm;
@@ -168,7 +168,7 @@ public class UI {
});
CommonUI.menuBars.put(VariantsSet.class, new VariantsMenuBar());
CommonUI.menuBars.put(SubsribersDBTable.class, new SubscribersMenuBar());
CommonUI.menuBars.put(SapforProfilesDBTable.class, new DataMenuBar("профили", PassCode_2021.SaveProfile, PassCode_2021.EditProfile, PassCode_2021.ApplyProfile, PassCode_2021.DeleteProfile));
CommonUI.menuBars.put(SapforProfilesDBTable.class, new DataMenuBar("профили", PassCode.SaveProfile, PassCode.EditProfile, PassCode.ApplyProfile, PassCode.DeleteProfile));
CommonUI.menuBars.put(ServerSapforsDBTable.class, new ServerSapforsBar());
CommonUI.menuBars.put(SapforSettingsDBTable.class, new SapforSettingsBar());
CommonUI.menuBars.put(SapforSettingsCommandsDBTable.class, new SapforSettingsCommandsBar());

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

@@ -13,8 +13,8 @@ import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
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 _VisualDVM.Visual.Interface.CallbackWindow;
import _VisualDVM.Visual.Interface.CommentInterface;
import _VisualDVM.Visual.Interface.DescriptionInterface;
@@ -168,10 +168,10 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
Global.componentsServer.db.bugReports.mountUI(bugReportsPanel);
Global.componentsServer.db.subscribers.mountUI(subscribersPanel);
Global.componentsServer.db.workspaces.mountUI(workspacesPanel);
settingsTools.add(Pass_2021.passes.get(PassCode_2021.ApplyBugReportSettings).createButton());
settingsTools.add(Pass.passes.get(PassCode.ApplyBugReportSettings).createButton());
//-
if (!Pass_2021.passes.get(PassCode_2021.CheckAccount).isDone()) {
accountTools.add(Pass_2021.passes.get(PassCode_2021.CheckAccount).createButton());
if (!Pass.passes.get(PassCode.CheckAccount).isDone()) {
accountTools.add(Pass.passes.get(PassCode.CheckAccount).createButton());
}
//--
BugReportsKeyFilter.getDocument().addDocumentListener(new DocumentListener() {
@@ -276,9 +276,9 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
});
//-
accountTools.addSeparator();
accountTools.add(Pass_2021.passes.get(PassCode_2021.StartComponentsServer).createButton());
accountTools.add(Pass_2021.passes.get(PassCode_2021.ShutdownComponentsServer).createButton());
accountTools.add(Pass_2021.passes.get(PassCode_2021.PublishComponentsServer).createButton());
accountTools.add(Pass.passes.get(PassCode.StartComponentsServer).createButton());
accountTools.add(Pass.passes.get(PassCode.ShutdownComponentsServer).createButton());
accountTools.add(Pass.passes.get(PassCode.PublishComponentsServer).createButton());
}
//-------------------------------------------
DescriptionTabs descriptionTabs = new DescriptionTabs();
@@ -374,62 +374,62 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
@Override
public void setUserRights() {
LockMyOnly();
Pass_2021.passes.get(PassCode_2021.AddSubscriber).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.EditSubscriber).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.DeleteSubscriber).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.DownloadAllBugReportsArchives).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.DeleteSubscriberWorkspace).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.CompileServerSapfor).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.DeleteServerSapfor).setControlsVisible(false);
Pass.passes.get(PassCode.AddSubscriber).setControlsVisible(false);
Pass.passes.get(PassCode.EditSubscriber).setControlsVisible(false);
Pass.passes.get(PassCode.DeleteSubscriber).setControlsVisible(false);
Pass.passes.get(PassCode.DownloadAllBugReportsArchives).setControlsVisible(false);
Pass.passes.get(PassCode.DeleteSubscriberWorkspace).setControlsVisible(false);
Pass.passes.get(PassCode.CompileServerSapfor).setControlsVisible(false);
Pass.passes.get(PassCode.DeleteServerSapfor).setControlsVisible(false);
//
Pass_2021.passes.get(PassCode_2021.ShutdownComponentsServer).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.StartComponentsServer).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.PublishComponentsServer).setControlsVisible(false);
Pass.passes.get(PassCode.ShutdownComponentsServer).setControlsVisible(false);
Pass.passes.get(PassCode.StartComponentsServer).setControlsVisible(false);
Pass.passes.get(PassCode.PublishComponentsServer).setControlsVisible(false);
//
Pass_2021.passes.get(PassCode_2021.ShutdownTestingServer).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.StartTestingServer).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.PublishTestingServer).setControlsVisible(false);
Pass.passes.get(PassCode.ShutdownTestingServer).setControlsVisible(false);
Pass.passes.get(PassCode.StartTestingServer).setControlsVisible(false);
Pass.passes.get(PassCode.PublishTestingServer).setControlsVisible(false);
UI.testingBar.showServerAdminLabel(false);
adminLabel.setVisible(false);
}
private void setDeveloperRights() {
UnlockMyOnly();
Pass_2021.passes.get(PassCode_2021.AddSubscriber).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.EditSubscriber).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.DeleteSubscriber).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.DownloadAllBugReportsArchives).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.DeleteSubscriberWorkspace).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.CompileServerSapfor).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.DeleteServerSapfor).setControlsVisible(false);
Pass.passes.get(PassCode.AddSubscriber).setControlsVisible(false);
Pass.passes.get(PassCode.EditSubscriber).setControlsVisible(false);
Pass.passes.get(PassCode.DeleteSubscriber).setControlsVisible(false);
Pass.passes.get(PassCode.DownloadAllBugReportsArchives).setControlsVisible(true);
Pass.passes.get(PassCode.DeleteSubscriberWorkspace).setControlsVisible(false);
Pass.passes.get(PassCode.CompileServerSapfor).setControlsVisible(false);
Pass.passes.get(PassCode.DeleteServerSapfor).setControlsVisible(false);
//
Pass_2021.passes.get(PassCode_2021.ShutdownComponentsServer).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.StartComponentsServer).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.PublishComponentsServer).setControlsVisible(false);
Pass.passes.get(PassCode.ShutdownComponentsServer).setControlsVisible(false);
Pass.passes.get(PassCode.StartComponentsServer).setControlsVisible(false);
Pass.passes.get(PassCode.PublishComponentsServer).setControlsVisible(false);
//
Pass_2021.passes.get(PassCode_2021.ShutdownTestingServer).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.StartTestingServer).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.PublishTestingServer).setControlsVisible(false);
Pass.passes.get(PassCode.ShutdownTestingServer).setControlsVisible(false);
Pass.passes.get(PassCode.StartTestingServer).setControlsVisible(false);
Pass.passes.get(PassCode.PublishTestingServer).setControlsVisible(false);
UI.testingBar.showServerAdminLabel(false);
adminLabel.setVisible(false);
}
@Override
public void setAdminRights() {
UnlockMyOnly();
Pass_2021.passes.get(PassCode_2021.AddSubscriber).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.EditSubscriber).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.DeleteSubscriber).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.DownloadAllBugReportsArchives).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.DeleteSubscriberWorkspace).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.CompileServerSapfor).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.DeleteServerSapfor).setControlsVisible(true);
Pass.passes.get(PassCode.AddSubscriber).setControlsVisible(true);
Pass.passes.get(PassCode.EditSubscriber).setControlsVisible(true);
Pass.passes.get(PassCode.DeleteSubscriber).setControlsVisible(true);
Pass.passes.get(PassCode.DownloadAllBugReportsArchives).setControlsVisible(true);
Pass.passes.get(PassCode.DeleteSubscriberWorkspace).setControlsVisible(true);
Pass.passes.get(PassCode.CompileServerSapfor).setControlsVisible(true);
Pass.passes.get(PassCode.DeleteServerSapfor).setControlsVisible(true);
//
Pass_2021.passes.get(PassCode_2021.ShutdownComponentsServer).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.StartComponentsServer).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.PublishComponentsServer).setControlsVisible(true);
Pass.passes.get(PassCode.ShutdownComponentsServer).setControlsVisible(true);
Pass.passes.get(PassCode.StartComponentsServer).setControlsVisible(true);
Pass.passes.get(PassCode.PublishComponentsServer).setControlsVisible(true);
//--
Pass_2021.passes.get(PassCode_2021.ShutdownTestingServer).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.StartTestingServer).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.PublishTestingServer).setControlsVisible(true);
Pass.passes.get(PassCode.ShutdownTestingServer).setControlsVisible(true);
Pass.passes.get(PassCode.StartTestingServer).setControlsVisible(true);
Pass.passes.get(PassCode.PublishTestingServer).setControlsVisible(true);
//--
UI.testingBar.showServerAdminLabel(true);
adminLabel.setVisible(true);
@@ -480,73 +480,73 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
Global.componentsServer.db.subscribers.ClearUI();
}
private void ShowDraft() {
Pass_2021.setPassesControlsVisible(true,
PassCode_2021.PublishBugReport,
PassCode_2021.SaveBugReportRecipients,
PassCode_2021.SaveBugReportExecutor,
PassCode_2021.DeleteBugReport
Pass.setPassesControlsVisible(true,
PassCode.PublishBugReport,
PassCode.SaveBugReportRecipients,
PassCode.SaveBugReportExecutor,
PassCode.DeleteBugReport
);
Pass_2021.setPassesControlsVisible(false,
PassCode_2021.AppendBugReportDescription,
PassCode_2021.AppendBugReportComment,
PassCode_2021.SaveBugReportDescription,
PassCode_2021.SaveBugReportComment,
PassCode_2021.OpenBugReport,
PassCode_2021.CloseBugReport,
PassCode_2021.OpenBugReportTestProject,
PassCode_2021.UpdateBugReportProgress
Pass.setPassesControlsVisible(false,
PassCode.AppendBugReportDescription,
PassCode.AppendBugReportComment,
PassCode.SaveBugReportDescription,
PassCode.SaveBugReportComment,
PassCode.OpenBugReport,
PassCode.CloseBugReport,
PassCode.OpenBugReportTestProject,
PassCode.UpdateBugReportProgress
);
}
private void ShowUserExecutor() {
Pass_2021.setPassesControlsVisible(true,
PassCode_2021.AppendBugReportComment,
PassCode_2021.UpdateBugReportProgress,
PassCode_2021.OpenBugReportTestProject
Pass.setPassesControlsVisible(true,
PassCode.AppendBugReportComment,
PassCode.UpdateBugReportProgress,
PassCode.OpenBugReportTestProject
);
Pass_2021.setPassesControlsVisible(false,
PassCode_2021.PublishBugReport,
PassCode_2021.SaveBugReportRecipients,
PassCode_2021.SaveBugReportExecutor,
PassCode_2021.SaveBugReportDescription,
PassCode_2021.SaveBugReportComment,
PassCode_2021.AppendBugReportDescription,
PassCode_2021.OpenBugReport,
PassCode_2021.CloseBugReport,
PassCode_2021.DeleteBugReport
Pass.setPassesControlsVisible(false,
PassCode.PublishBugReport,
PassCode.SaveBugReportRecipients,
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportDescription,
PassCode.SaveBugReportComment,
PassCode.AppendBugReportDescription,
PassCode.OpenBugReport,
PassCode.CloseBugReport,
PassCode.DeleteBugReport
);
}
private void ShowSender() {
Pass_2021.setPassesControlsVisible(true,
PassCode_2021.AppendBugReportComment,
PassCode_2021.UpdateBugReportProgress,
PassCode_2021.OpenBugReportTestProject,
PassCode_2021.SaveBugReportRecipients,
PassCode_2021.SaveBugReportExecutor,
PassCode_2021.SaveBugReportDescription,
PassCode_2021.SaveBugReportComment,
PassCode_2021.AppendBugReportDescription,
PassCode_2021.OpenBugReport,
PassCode_2021.CloseBugReport,
PassCode_2021.DeleteBugReport
Pass.setPassesControlsVisible(true,
PassCode.AppendBugReportComment,
PassCode.UpdateBugReportProgress,
PassCode.OpenBugReportTestProject,
PassCode.SaveBugReportRecipients,
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportDescription,
PassCode.SaveBugReportComment,
PassCode.AppendBugReportDescription,
PassCode.OpenBugReport,
PassCode.CloseBugReport,
PassCode.DeleteBugReport
);
Pass_2021.setPassesControlsVisible(false,
PassCode_2021.PublishBugReport
Pass.setPassesControlsVisible(false,
PassCode.PublishBugReport
);
}
private void ShowUser() {
Pass_2021.setPassesControlsVisible(false,
PassCode_2021.PublishBugReport,
PassCode_2021.SaveBugReportRecipients,
PassCode_2021.SaveBugReportExecutor,
PassCode_2021.SaveBugReportDescription,
PassCode_2021.SaveBugReportComment,
PassCode_2021.AppendBugReportDescription,
PassCode_2021.OpenBugReport,
PassCode_2021.CloseBugReport,
PassCode_2021.DeleteBugReport,
PassCode_2021.AppendBugReportComment,
PassCode_2021.UpdateBugReportProgress,
PassCode_2021.OpenBugReportTestProject
Pass.setPassesControlsVisible(false,
PassCode.PublishBugReport,
PassCode.SaveBugReportRecipients,
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportDescription,
PassCode.SaveBugReportComment,
PassCode.AppendBugReportDescription,
PassCode.OpenBugReport,
PassCode.CloseBugReport,
PassCode.DeleteBugReport,
PassCode.AppendBugReportComment,
PassCode.UpdateBugReportProgress,
PassCode.OpenBugReportTestProject
);
}
@Override
@@ -571,7 +571,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
target.sapfor_settings
)
);
Pass_2021.setPassesControlsVisible(true, PassCode_2021.ApplyBugReportSettings);
Pass.setPassesControlsVisible(true, PassCode.ApplyBugReportSettings);
//
if (target.state.equals(BugReportState.draft)) {
ShowDraft();
@@ -606,19 +606,19 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
BugReportCommentAddition.setText("");
BugReportSettings.setText("");
//-
Pass_2021.setPassesControlsVisible(false, PassCode_2021.SaveBugReportExecutor,
PassCode_2021.SaveBugReportRecipients,
PassCode_2021.AppendBugReportDescription,
PassCode_2021.SaveBugReportDescription,
PassCode_2021.SaveBugReportComment,
PassCode_2021.AppendBugReportComment,
PassCode_2021.ApplyBugReportSettings,
PassCode_2021.PublishBugReport,
PassCode_2021.OpenBugReport,
PassCode_2021.CloseBugReport,
PassCode_2021.OpenBugReportTestProject,
PassCode_2021.UpdateBugReportProgress,
PassCode_2021.DeleteBugReport
Pass.setPassesControlsVisible(false, PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportRecipients,
PassCode.AppendBugReportDescription,
PassCode.SaveBugReportDescription,
PassCode.SaveBugReportComment,
PassCode.AppendBugReportComment,
PassCode.ApplyBugReportSettings,
PassCode.PublishBugReport,
PassCode.OpenBugReport,
PassCode.CloseBugReport,
PassCode.OpenBugReportTestProject,
PassCode.UpdateBugReportProgress,
PassCode.DeleteBugReport
);
}
@Override

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

@@ -1,7 +1,7 @@
package _VisualDVM.Visual.Windows;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
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 _VisualDVM.Visual.Interface.CommentInterface;
import javax.swing.*;
@@ -14,8 +14,8 @@ public class CommentFields implements CommentInterface {
private JPanel additionPanel;
public CommentFields() {
LoadSplitters();
commentTools.add(Pass_2021.passes.get(PassCode_2021.SaveBugReportComment).createButton());
commentAdditionTools.add(Pass_2021.passes.get(PassCode_2021.AppendBugReportComment).createButton());
commentTools.add(Pass.passes.get(PassCode.SaveBugReportComment).createButton());
commentAdditionTools.add(Pass.passes.get(PassCode.AppendBugReportComment).createButton());
}
@Override
public void setEditorScroll(JScrollPane scroll_in) {

6
src/_VisualDVM/Visual/Windows/CommentTabs.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Windows;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import _VisualDVM.Visual.Interface.CommentInterface;
import javax.swing.*;
@@ -10,13 +10,13 @@ public class CommentTabs implements CommentInterface {
private JPanel additionPanel;
public CommentTabs() {
tabs.setTabComponentAt(0, new TabToolBar("Комментарий", PassCode_2021.SaveBugReportComment) {
tabs.setTabComponentAt(0, new TabToolBar("Комментарий", PassCode.SaveBugReportComment) {
@Override
public void leftMouseAction() {
tabs.setSelectedIndex(0);
}
});
tabs.setTabComponentAt(1, new TabToolBar("Дополнение", PassCode_2021.AppendBugReportComment) {
tabs.setTabComponentAt(1, new TabToolBar("Дополнение", PassCode.AppendBugReportComment) {
@Override
public void leftMouseAction() {
tabs.setSelectedIndex(1);

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

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Windows;
import Common.CommonConstants;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
@@ -11,7 +11,7 @@ import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.UI;
import Common.Utils.TextLog;
import _VisualDVM.Utils;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Pass;
import javafx.util.Pair;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
import org.fife.ui.rtextarea.RTextScrollPane;
@@ -76,8 +76,8 @@ public abstract class ComparisonForm<T> {
public void ApplyObject() {
RemoveObject();
TextLog log = new TextLog();
if (CurrentAnchestor.Check(log, getCurrentObjectName())) {
object = (T) CurrentAnchestor.get(getCurrentObjectName());
if (Current_.Check(log, getCurrentObjectName())) {
object = (T) Current_.get(getCurrentObjectName());
applyObject();
showObject();
} else
@@ -304,7 +304,7 @@ public abstract class ComparisonForm<T> {
RemoveObject();
}
public void DoComparePass(boolean startCondition) {
Pass_2021 pass = new Pass_2021() {
Pass pass = new Pass() {
@Override
public String getDescription() {
return "Сравнение";
@@ -329,7 +329,7 @@ public abstract class ComparisonForm<T> {
pass.Do();
}
public void DoShowPass(boolean startCondition) {
Pass_2021 pass = new Pass_2021() {
Pass pass = new Pass() {
@Override
public String getDescription() {
return "Отображение";

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

@@ -1,7 +1,7 @@
package _VisualDVM.Visual.Windows;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
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 _VisualDVM.Visual.Interface.DescriptionInterface;
import javax.swing.*;
@@ -14,8 +14,8 @@ public class DescriptionFields implements DescriptionInterface {
private JPanel additionPanel;
public DescriptionFields() {
LoadSplitters();
descriptionAdditionTools.add(Pass_2021.passes.get(PassCode_2021.AppendBugReportDescription).createButton());
descriptionTools.add(Pass_2021.passes.get(PassCode_2021.SaveBugReportDescription).createButton());
descriptionAdditionTools.add(Pass.passes.get(PassCode.AppendBugReportDescription).createButton());
descriptionTools.add(Pass.passes.get(PassCode.SaveBugReportDescription).createButton());
}
//---------
@Override

6
src/_VisualDVM/Visual/Windows/DescriptionTabs.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Windows;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import _VisualDVM.Visual.Interface.DescriptionInterface;
import javax.swing.*;
@@ -9,13 +9,13 @@ public class DescriptionTabs implements DescriptionInterface {
private JPanel editorPanel;
private JPanel additionPanel;
public DescriptionTabs() {
tabs.setTabComponentAt(0, new TabToolBar("Описание", PassCode_2021.SaveBugReportDescription) {
tabs.setTabComponentAt(0, new TabToolBar("Описание", PassCode.SaveBugReportDescription) {
@Override
public void leftMouseAction() {
tabs.setSelectedIndex(0);
}
});
tabs.setTabComponentAt(1, new TabToolBar("Дополнение", PassCode_2021.AppendBugReportDescription) {
tabs.setTabComponentAt(1, new TabToolBar("Дополнение", PassCode.AppendBugReportDescription) {
@Override
public void leftMouseAction() {
tabs.setSelectedIndex(1);

6
src/_VisualDVM/Visual/Windows/FileForm.java
View File

@@ -18,8 +18,8 @@ import _VisualDVM.ProjectData.Messages.Warnings.MessageWarning;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.FileArraysTree;
import _VisualDVM.ProjectData.SapforData.Functions.UI.FileFunctionsTree;
import _VisualDVM.ProjectData.SapforData.Loops.UI.FileLoopsTree;
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 _VisualDVM.Visual.Interface.FileWindow;
import _VisualDVM.Visual.Interface.FormWithSplitters;
import _VisualDVM.Visual.Interface.SPFEditorInterface;
@@ -99,7 +99,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
RefreshTabsNames();
UI.fileMenuBar.sToGo.addChangeListener(e -> Body.gotoLine((Integer) UI.fileMenuBar.sToGo.getValue()));
ShowProperties();
Pass_2021.passes.get(PassCode_2021.Save).setControlsEnabled(false);
Pass.passes.get(PassCode.Save).setControlsEnabled(false);
//-
if (Global.properties.collapseFileGraphs)
CollapseGraphs();

22
src/_VisualDVM/Visual/Windows/FunctionsForm.java
View File

@@ -5,8 +5,8 @@ import Common.Visual.TextField.StyledTextField;
import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphUI;
import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions;
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 _VisualDVM.Visual.Interface.FunctionsWindow;
import javafx.util.Pair;
@@ -100,7 +100,7 @@ public class FunctionsForm implements FunctionsWindow {
bSaveGraphAsImage.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021.passes.get(PassCode_2021.SaveGraph).Do();
Pass.passes.get(PassCode.SaveGraph).Do();
}
});
sIterations.setModel(new SpinnerNumberModel(Current.getProject().fgIterations,
@@ -155,36 +155,36 @@ public class FunctionsForm implements FunctionsWindow {
ShowStandardFilter.addActionListener(e -> {
SPF_GetGraphFunctionPositions.showStandardFunctions = ShowStandardFilter.isSelected();
FunctionsGraphUI.ffTimer.stop();
Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctionPositions).Do();
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
});
ShowExternalFilter.addActionListener(e -> {
SPF_GetGraphFunctionPositions.showExternalFunctions = ShowExternalFilter.isSelected();
FunctionsGraphUI.ffTimer.stop();
Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctionPositions).Do();
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
});
ShowUnreachableFilter.addActionListener(e -> {
SPF_GetGraphFunctionPositions.showUnreachableFunctions = ShowUnreachableFilter.isSelected();
FunctionsGraphUI.ffTimer.stop();
Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctionPositions).Do();
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
});
cbShowByCurrentFunction.addActionListener(e -> {
SPF_GetGraphFunctionPositions.showByCurrentFunction = cbShowByCurrentFunction.isSelected();
FunctionsGraphUI.ffTimer.stop();
Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctionPositions).Do();
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
});
ShowIn.addActionListener(e -> {
SPF_GetGraphFunctionPositions.showIn = ShowIn.isSelected();
FunctionsGraphUI.ffTimer.stop();
Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctionPositions).Do();
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
});
ShowOut.addActionListener(e -> {
SPF_GetGraphFunctionPositions.showOut = ShowOut.isSelected();
FunctionsGraphUI.ffTimer.stop();
Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctionPositions).Do();
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
});
//---------------------------------------------------------
filtersBar.add(Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctionPositions).createButton(), 0);
filtersBar.add(Pass_2021.passes.get(PassCode_2021.ApplyCurrentFunction).createButton(), 6);
filtersBar.add(Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).createButton(), 0);
filtersBar.add(Pass.passes.get(PassCode.ApplyCurrentFunction).createButton(), 6);
filtersBar.setPreferredSize(new Dimension(0,30));
}
private void createUIComponents() {

8
src/_VisualDVM/Visual/Windows/MainForm.java
View File

@@ -9,8 +9,8 @@ import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Form;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
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 _VisualDVM.Visual.Interface.*;
import javax.swing.*;
@@ -51,7 +51,7 @@ public class MainForm extends Form implements MainWindow {
}
@Override
public void AfterClose() {
Pass_2021.passes.get(PassCode_2021.CloseCurrentProject).Do();
Pass.passes.get(PassCode.CloseCurrentProject).Do();
if (UI.getVersionsWindow() != null)
((VersionsForm) UI.getVersionsWindow()).SaveSplitters();
SaveCallbackPanel();
@@ -85,7 +85,7 @@ public class MainForm extends Form implements MainWindow {
globalTabs.insertTab("", null,
(projectForm = new ProjectForm()).content, Current.getProject().description, 0);
globalTabs.setTabComponentAt(0,
new TabToolBar("Проект: " + Current.getProject().name, PassCode_2021.CloseCurrentProject) {
new TabToolBar("Проект: " + Current.getProject().name, PassCode.CloseCurrentProject) {
@Override
public void leftMouseAction() {
globalTabs.setSelectedIndex(0);

10
src/_VisualDVM/Visual/Windows/ProjectForm.java
View File

@@ -15,8 +15,8 @@ import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.ProjectData.SapforData.Functions.UI.InlineTree;
import _VisualDVM.ProjectData.SapforData.Functions.UI.InlineTree2;
import _VisualDVM.ProjectData.SapforData.Includes.UI.IncludesTree;
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 _VisualDVM.Visual.Interface.*;
import javax.swing.*;
@@ -156,7 +156,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
// projectTabs.setTitleAt(0, "Файл: " + Current.getFile().name);
fileBackground.add((Current.getFile().form = new FileForm(Current.getFile())).getContent());
projectTabs.setTabComponentAt(0,
new TabToolBar("Файл: " + Current.getFile().name, PassCode_2021.CloseCurrentFile) {
new TabToolBar("Файл: " + Current.getFile().name, PassCode.CloseCurrentFile) {
@Override
public void leftMouseAction() {
projectTabs.setSelectedIndex(0);
@@ -183,7 +183,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
else if (Current.getProject().db.files.containsKey(fileName)) {
DBProjectFile targetFile = Current.getProject().db.files.get(fileName);
targetFile.UpdateLastLine(line);
Pass_2021.passes.get(PassCode_2021.OpenCurrentFile).Do(targetFile);
Pass.passes.get(PassCode.OpenCurrentFile).Do(targetFile);
}
}
@Override
@@ -231,7 +231,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
RefreshProjectFiles();
DBProjectFile badFile = Current.getProject().getFirstBadFile();
if (badFile != null) {
Pass_2021.passes.get(PassCode_2021.OpenCurrentFile).Do(badFile);
Pass.passes.get(PassCode.OpenCurrentFile).Do(badFile);
UI.getMainWindow().FocusProject();
UI.getMainWindow().getProjectWindow().FocusFile();
}

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

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Windows;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
@@ -10,8 +10,8 @@ import Common.Utils.TextLog;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTasksPackageTree;
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 SapforPackagesComparisonForm {
@@ -69,9 +69,9 @@ public class SapforPackagesComparisonForm {
RemoveObject();
//---
TextLog log = new TextLog();
if (CurrentAnchestor.Check(log, Current.SapforPackage)) {
if (Current_.Check(log, Current.SapforPackage)) {
object = Current.getSapforPackage();
if (object.isLoaded() || (Pass_2021.passes.get(PassCode_2021.DownloadSapforPackage).Do(object))) {
if (object.isLoaded() || (Pass.passes.get(PassCode.DownloadSapforPackage).Do(object))) {
showObject();
}
} else
@@ -80,7 +80,7 @@ public class SapforPackagesComparisonForm {
public void ApplyObject(DBObject object_in) {
RemoveObject();
object = (SapforPackage) object_in;
if (object.isLoaded() || (Pass_2021.passes.get(PassCode_2021.DownloadSapforPackage).Do(object))) {
if (object.isLoaded() || (Pass.passes.get(PassCode.DownloadSapforPackage).Do(object))) {
showObject();
}
}
@@ -181,7 +181,7 @@ public class SapforPackagesComparisonForm {
RemoveObject();
}
public void DoComparePass() {
Pass_2021 pass = new Pass_2021() {
Pass pass = new Pass() {
SapforPackage package1;
SapforPackage package2;
@Override

8
src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java
View File

@@ -8,8 +8,8 @@ import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforVersion_json;
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.util.Arrays;
@@ -34,8 +34,8 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
bApplyObject.setVisible(false);
bClose.setVisible(false);
cbFile = new JComboBox<>();
tools.add(Pass_2021.passes.get(
(current.equals(Current.SapforEtalonVersion) ? PassCode_2021.OpenSapforEtalonVersion : PassCode_2021.OpenSapforVersion
tools.add(Pass.passes.get(
(current.equals(Current.SapforEtalonVersion) ? PassCode.OpenSapforEtalonVersion : PassCode.OpenSapforVersion
)).createButton(), 3);
tools.add(cbFile, 4);
//--

6
src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
View File

@@ -6,8 +6,8 @@ import _VisualDVM.Current;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.Trees.StyledTree;
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;
import javafx.util.Pair;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import org.fife.ui.rtextarea.SearchContext;
@@ -173,7 +173,7 @@ public class SearchReplaceForm extends Form {
if (selectedFile != null) {
Pair<String, Long> info = (Pair<String, Long>) selectedFile.getUserObject();
if (Current.getProject().db.files.containsKey(info.getKey())) {
Pass_2021.passes.get(PassCode_2021.OpenCurrentFile).Do(Current.getProject().db.files.get(info.getKey()));
Pass.passes.get(PassCode.OpenCurrentFile).Do(Current.getProject().db.files.get(info.getKey()));
//--->>>
replaceOn.setSelected(false);
setMode(false);

10
src/_VisualDVM/Visual/Windows/TabToolBar.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.Visual.Windows;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
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.event.MouseAdapter;
import java.awt.event.MouseEvent;
public class TabToolBar extends VisualiserMenuBar {
public TabToolBar(String titleText, PassCode_2021... passes) {
public TabToolBar(String titleText, PassCode... passes) {
setFloatable(false);
setOpaque(false);
//-
@@ -16,8 +16,8 @@ public class TabToolBar extends VisualiserMenuBar {
add(title);
addSeparator();
//-
for (PassCode_2021 code : passes)
add(Pass_2021.passes.get(code).createTabButton());
for (PassCode code : passes)
add(Pass.passes.get(code).createTabButton());
MouseAdapter adapter = new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {

4
src/_VisualDVM/Visual/Windows/TestingForm.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Windows;
import Common.CommonConstants;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
@@ -271,7 +271,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
testingTabs.setSelectedIndex(3);
}
public void RestoreLastCredentials() {
Credentials credentials = (Credentials) CurrentAnchestor.get(Current.Credentials);
Credentials credentials = (Credentials) Current_.get(Current.Credentials);
if (credentials.machine_id != CommonConstants.Nan) {
if (((GlobalDatabase)CommonUtils.db).machines.containsKey(credentials.machine_id)) {
((GlobalDatabase)CommonUtils.db).machines.ShowUI(credentials.machine_id);

6
src/_VisualDVM/Visual/Windows/WelcomeForm.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Visual.Windows;
import Common.Visual.DragDrop.FileDrop;
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 WelcomeForm {
@@ -11,7 +11,7 @@ public class WelcomeForm {
// end filesDropped
new FileDrop(System.out, WelcomeText, files -> {
if (files.length > 0) {
Pass_2021.passes.get(PassCode_2021.OpenCurrentProject).Do(files[0]);
Pass.passes.get(PassCode.OpenCurrentProject).Do(files[0]);
}
});
}