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

11
src/_VisualDVM/Global.java
View File

@@ -207,7 +207,7 @@ public class Global {
return (bad_state == 0);
}
public static void changeSetting(SettingName settingName, Object new_value) throws Exception {
Pass.passes.get(PassCode.UpdateSetting).Do(settingName, new_value);
Global.mainModule.getPass(PassCode.UpdateSetting).Do(settingName, new_value);
}
public static String packSapforSettings() {
Vector<String> res_ = new Vector<>();
@@ -224,10 +224,10 @@ public class Global {
}
//--
public static void NormalMode(int port) throws Exception {
mainModule= new MainModule();
//-------------------------------->>
UI_.active = true;
UI_.setTheme(new LightSPFEditorTheme());
mainModule= new MainModule();
CheckVisualiserDirectories();
CreateLogAtComponentsPath();
//-
@@ -245,7 +245,6 @@ public class Global {
messagesServer.Start();
//создание списков служебных объектов
UI.CreateAll();
Pass.CreateAll();
//единственное меню до остальных.
UI_.menuBars.put(ComponentsSet.class, new ComponentsMenuBar());
Components = new ComponentsSet();
@@ -267,7 +266,7 @@ public class Global {
//light_editor.xml-------->>
//-------->>
if (properties.AutoUpdateSearch)
Pass.passes.get(PassCode.GetComponentsActualVersions).Do();
Global.mainModule.getPass(PassCode.GetComponentsActualVersions).Do();
ValidateComponentsStates();
if ((need_update > 0) || (bad_state > 0)) {
boolean flag = true;
@@ -298,10 +297,10 @@ public class Global {
//в проперти их!
//-- чисто чтобы создать таблицы. соединения на стороне клиента не предвидится.
if (mainModule.getDb().settings.get(SettingName.AutoBugReportsLoad).toBoolean())
Pass.passes.get(PassCode.SynchronizeBugReports).Do();
Global.mainModule.getPass(PassCode.SynchronizeBugReports).Do();
//--
if (mainModule.getDb().settings.get(SettingName.AutoTestsLoad).toBoolean())
Pass.passes.get(PassCode.SynchronizeTests).Do();
Global.mainModule.getPass(PassCode.SynchronizeTests).Do();
Pass.CheckAllStats();
Global.mainModule.getSapfor().refreshPid(); //без сапфора сюда это все равно не дойдет.
UI.CreateMenus();

2
src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java
View File

@@ -37,7 +37,7 @@ public class CompilerFields implements DialogFields {
if (file != null)
dst = file.getAbsolutePath();
} else {
if (Pass.passes.get(PassCode.SelectRemoteFile).Do(true))
if ( Global.mainModule.getPass(PassCode.SelectRemoteFile).Do(true))
dst = Global.mainModule.getRemoteFile().full_name;
}
if (dst != null)

6
src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.GlobalData.Machine;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Global;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -20,7 +20,7 @@ public class MachinesMenuBar extends DataMenuBar {
addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass.passes.get(PassCode.UpdateProperty).Do("collapseCredentials", true);
Global.mainModule.getPass(PassCode.UpdateProperty).Do("collapseCredentials", true);
}
});
}

4
src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java
View File

@@ -32,13 +32,13 @@ public class ModuleAnchestorFields implements DialogFields {
compilers.values().forEach(compiler -> cbCompilers.addItem(compiler));
bHelp.addActionListener(e -> {
if (cbCompilers.getSelectedItem() != null) {
Pass.passes.get(PassCode.ShowCompilerHelp).Do(compiler, true);
Global.mainModule.getPass(PassCode.ShowCompilerHelp).Do(compiler, true);
} else UI_.Info("Компилятор не выбран");
});
BPickOptions.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass<String> pass = Pass.passes.get(PassCode.PickCompilerOptions);
Pass<String> pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
if (pass.Do(compiler)) {
UI_.TrySelect(cbFlags, pass.target);
}

8
src/_VisualDVM/GlobalData/Settings/DBSetting.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.GlobalData.Settings;
import Common.Database.Objects.DBObject;
import Common.Utils.Utils_;
import _VisualDVM.Visual.Menus.StableMenuItem;
import _VisualDVM.Repository.Component.ComponentType;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.Repository.Component.ComponentType;
import _VisualDVM.Visual.Menus.StableMenuItem;
import com.sun.org.glassfish.gmbal.Description;
import javax.swing.*;
@@ -49,7 +49,7 @@ public class DBSetting extends DBObject {
menu_item.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Pass.passes.get(PassCode.UpdateSetting).Do(Name);
Global.mainModule.getPass(PassCode.UpdateSetting).Do(Name);
}
});
Mark();

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

@@ -1,16 +1,16 @@
package _VisualDVM.GlobalData.Tasks.CompilationTask;
import _VisualDVM.Current;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.TableMenu;
import _VisualDVM.Visual.UI;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.TableMenu;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.Visual.UI;
import java.util.LinkedHashMap;
@@ -60,7 +60,7 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
public void CreateControl() {
super.CreateControl();
TableMenu dataTableMenu = new TableMenu(control);
dataTableMenu.add(Pass.passes.get(PassCode.DeleteSelectedCompilationTasks).createMenuItem());
dataTableMenu.add( Global.mainModule.getPass(PassCode.DeleteSelectedCompilationTasks).createMenuItem());
control.setComponentPopupMenu(dataTableMenu);
}

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

@@ -1,11 +1,11 @@
package _VisualDVM.GlobalData.Tasks.RunTask;
import _VisualDVM.Current;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.TableMenu;
import _VisualDVM.Visual.UI;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import static Common.Visual.Tables.TableRenderers.RendererDate;
import static Common.Visual.Tables.TableRenderers.RendererStatusEnum;
@@ -47,7 +47,7 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
public void CreateControl() {
super.CreateControl();
TableMenu dataTableMenu = new TableMenu(control);
dataTableMenu.add(Pass.passes.get(PassCode.DeleteSelectedRunTasks).createMenuItem());
dataTableMenu.add( Global.mainModule.getPass(PassCode.DeleteSelectedRunTasks).createMenuItem());
control.setComponentPopupMenu(dataTableMenu);
}
};

2
src/_VisualDVM/GlobalProperties.java
View File

@@ -154,7 +154,7 @@ public class GlobalProperties {
getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png");
//-
menu_item.addActionListener(e -> {
if (Pass.passes.get(PassCode.UpdateProperty).Do(fieldName, !getFlag(fieldName)))
if ( Global.mainModule.getPass(PassCode.UpdateProperty).Do(fieldName, !getFlag(fieldName)))
menu_item.setIcon(Utils_.getIcon(getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
});
menu.add(menu_item);

59
src/_VisualDVM/MainModule.java
View File

@@ -1,6 +1,9 @@
package _VisualDVM;
import Common.Current_;
import Common.Passes.Pass;
import Common.Passes.PassCode_;
import Common.Utils.Vector_;
import MainModule_.MainModule_;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.UI.PassForm;
import _VisualDVM.GlobalData.Account.Account;
import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -37,12 +40,34 @@ import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;
import java.util.Vector;
public class MainModule extends MainModule_<GlobalDatabase> {
Vector<PassCode> accountRoleDependentPasses = new Vector_<>(
PassCode.AddSubscriber,
PassCode.EditSubscriber,
PassCode.DeleteSubscriber,
PassCode.DeleteSubscriberWorkspace,
//--
PassCode.DownloadAllBugReportsArchives,
//--
PassCode.CompileServerSapfor,
PassCode.DeleteServerSapfor,
//
PassCode.ShutdownComponentsServer,
PassCode.StartComponentsServer,
PassCode.PublishComponentsServer,
//
PassCode.ShutdownTestingServer,
PassCode.StartTestingServer,
PassCode.PublishTestingServer
);
public MainModule() {
super(GlobalDatabase.class);
}
//--
public boolean HasProject() {return get(Current.Project) != null;}
public boolean HasProject() {
return get(Current.Project) != null;
}
public db_project_info getProject() {
return (db_project_info) get(Current.Project);
}
@@ -50,7 +75,9 @@ public class MainModule extends MainModule_<GlobalDatabase> {
public boolean HasFile() {
return get(Current.File) != null;
}
public boolean HasAccount() { return get(Current.Account) != null; }
public boolean HasAccount() {
return get(Current.Account) != null;
}
public boolean HasMachine() {
return get(Current.Machine) != null;
}
@@ -63,7 +90,7 @@ public class MainModule extends MainModule_<GlobalDatabase> {
public boolean HasRemoteFile() {
return get(Current.RemoteFile) != null;
}
public boolean HasMakefile() {
public boolean HasMakefile() {
return get(Current.Makefile) != null;
}
public boolean HasRunConfiguration() {
@@ -81,7 +108,7 @@ public class MainModule extends MainModule_<GlobalDatabase> {
public boolean HasProjectView() {
return get(Current.ProjectView) != null;
}
public Credentials getCredentials(){
public Credentials getCredentials() {
return (Credentials) get(Current.Credentials);
}
public SapforSettings getSapforSettings() {
@@ -268,18 +295,18 @@ public class MainModule extends MainModule_<GlobalDatabase> {
public DVMRunTask getDVMRunTask() {
return (DVMRunTask) get(Current.DVMRunTask);
}
public void DropCurrentFile(){
public void DropCurrentFile() {
set(Current.File, null);
set(Current.FileGraphElement, null);
set(Current.Notes, null);
set(Current.Warnings, null);
set(Current.Errors, null);
}
public void DropCurrentProject(){
public void DropCurrentProject() {
set(Current.Project, null);
set(Current.File, null);
set(Current.Function, null);
set(Current.SelectedFunction,null);
set(Current.SelectedFunction, null);
set(Current.ProjectNode, null);
set(Current.SelectedFile, null);
set(Current.SelectedDirectory, null);
@@ -288,4 +315,20 @@ public class MainModule extends MainModule_<GlobalDatabase> {
set(Current.Array, null);
set(Current.DBArray, null);
}
@Override
public Class getPassCodesEnum() {
return PassCode.class;
}
public void SetUserAccess() {
for (PassCode code: accountRoleDependentPasses)
getPass(code).setControlsVisible(false);
}
public void SetDeveloperAccess() {
SetUserAccess();
getPass(PassCode.DownloadAllBugReportsArchives).setControlsVisible(true);
}
public void SetAdminAccess(){
for (PassCode code: accountRoleDependentPasses)
getPass(code).setControlsVisible(true);
}
}

6
src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
View File

@@ -69,7 +69,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
//текст изменился, значит M ка более не актуальна.
file.father.dropLastModification();
}
Pass.passes.get(PassCode.Save).Reset();
Global.mainModule.getPass(PassCode.Save).Reset();
}
}
});
@@ -185,13 +185,13 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
}
@Override
protected void saveFont() {
Pass.passes.get(PassCode.UpdateSetting).Do(
Global.mainModule.getPass(PassCode.UpdateSetting).Do(
SettingName.EditorFontSize,
getFont().getSize());
}
@Override
protected void saveText() {
Pass.passes.get(PassCode.Save).Do();
Global.mainModule.getPass(PassCode.Save).Do();
}
@Override
protected StyledPopupMenu createMenu() {

10
src/_VisualDVM/ProjectData/Files/UI/FilesTree.java
View File

@@ -29,11 +29,11 @@ public class FilesTree extends StyledTree {
break;
case KeyEvent.VK_ADD: //num lock +
case KeyEvent.VK_EQUALS: //+
Pass.passes.get(PassCode.IncludeFile).Do();
Global.mainModule.getPass(PassCode.IncludeFile).Do();
break;
case KeyEvent.VK_SUBTRACT: //num lock -
case KeyEvent.VK_MINUS: //-
Pass.passes.get(PassCode.ExcludeFile).Do();
Global.mainModule.getPass(PassCode.ExcludeFile).Do();
break;
case KeyEvent.VK_F2:
forkFD(PassCode.RenameFile, PassCode.RenameDirectory);
@@ -46,14 +46,14 @@ public class FilesTree extends StyledTree {
}
);
new FileDrop(System.out, this, files -> {
Pass.passes.get(PassCode.ImportFiles).Do(files);
Global.mainModule.getPass(PassCode.ImportFiles).Do(files);
});
Global.mainModule.set(Current.File, null);
}
private static void forkFD(PassCode file_pass, PassCode folder_pass) {
DefaultMutableTreeNode node = Global.mainModule.getProjectNode();
if (node != null)
Pass.passes.get((node.getUserObject() instanceof DBProjectFile) ?
Global.mainModule.getPass((node.getUserObject() instanceof DBProjectFile) ?
file_pass : folder_pass).Do();
}
@Override
@@ -89,7 +89,7 @@ public class FilesTree extends StyledTree {
//очень важно. иначе по открытии файла дерево остается в фокусе.
//и не происходит прокрутки скролла к строке!!
UI.getMainWindow().getProjectWindow().FocusFileTabs();
Pass.passes.get(PassCode.OpenCurrentFile).Do(o);
Global.mainModule.getPass(PassCode.OpenCurrentFile).Do(o);
}
}
}

6
src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java
View File

@@ -22,11 +22,11 @@ public class VersionsTree extends DataTree {
public void keyPressed(KeyEvent e) {
switch (e.getKeyCode()) {
case KeyEvent.VK_DELETE:
Pass.passes.get(PassCode.DeleteVersion).Do();
Global.mainModule.getPass(PassCode.DeleteVersion).Do();
break;
case KeyEvent.VK_ENTER:
if (Global.mainModule.HasVersion())
Pass.passes.get(PassCode.OpenCurrentProject).Do(Global.mainModule.getVersion());
Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(Global.mainModule.getVersion());
break;
}
}
@@ -60,7 +60,7 @@ public class VersionsTree extends DataTree {
}
@Override
public void LeftMouseAction2() {
Pass.passes.get(PassCode.OpenCurrentProject).Do(Global.mainModule.getVersion());
Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(Global.mainModule.getVersion());
}
@Override
protected int getStartLine() {

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

@@ -79,6 +79,6 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
}
@Override
public void CheckAll(boolean flag) {
Pass.passes.get(PassCode.MassSelectArrays).Do(flag,new Vector(Global.mainModule.getProject().declaratedArrays.Data.values()));
Global.mainModule.getPass(PassCode.MassSelectArrays).Do(flag,new Vector(Global.mainModule.getProject().declaratedArrays.Data.values()));
}
}

2
src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
View File

@@ -363,7 +363,7 @@ public class ProjectArray extends DBObject {
}
@Override
public void select(boolean flag) {
Pass.passes.get(PassCode.MassSelectArrays).Do(flag, this);
Global.mainModule.getPass(PassCode.MassSelectArrays).Do(flag, this);
}
@Override
public boolean isSelected() {

8
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
View File

@@ -1,20 +1,20 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import _VisualDVM.Visual.Menus.GraphMenu;
import Common.Visual.Trees.StyledTree;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.GraphMenu;
import javax.swing.*;
public class DistributionMenu extends GraphMenu {
JMenuItem mChangeDistribution;
public DistributionMenu(StyledTree tree) {
super(tree, "области распараллеливания");
mChangeDistribution = Pass.passes.get(PassCode.SPF_ModifyArrayDistribution).createMenuItem();
mChangeDistribution = Global.mainModule.getPass(PassCode.SPF_ModifyArrayDistribution).createMenuItem();
add(mChangeDistribution);
}
@Override
public void CheckElementsVisibility() {
super.CheckElementsVisibility();
mChangeDistribution.setVisible(Pass.passes.get(PassCode.SPF_GetArrayDistribution).isDone());
mChangeDistribution.setVisible( Global.mainModule.getPass(PassCode.SPF_GetArrayDistribution).isDone());
}
}

6
src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.ProjectData.SapforData.Functions;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Visual_DVM_2021.Passes.PassCode;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
public class FuncCall extends FileObjectWithMessages {
public String funcName = ""; //не нужны дополнительные поля.имя функции это уже ключ.
public boolean canBeInlined = false;
@@ -29,7 +29,7 @@ public class FuncCall extends FileObjectWithMessages {
}
@Override
public void Select(boolean flag) {
if (Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
if ( Global.mainModule.getPass(PassCode.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
UI_.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));

4
src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java
View File

@@ -2,7 +2,7 @@ package _VisualDVM.ProjectData.SapforData.Functions;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Global;
import java.util.Vector;
public class FuncCallH extends FuncCall {
@@ -38,7 +38,7 @@ public class FuncCallH extends FuncCall {
}
@Override
public void Select(boolean flag) {
if (Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
if ( Global.mainModule.getPass(PassCode.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
UI_.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));

2
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
View File

@@ -24,7 +24,7 @@ public class FunctionsGraphMenu extends StyledPopupMenu {
Global.mainModule.set(Current.Function, Global.mainModule.getSelectionFunction());
UI.getMainWindow().getProjectWindow().getFunctionsWindow().ShowCurrentFunction();
if (SPF_GetGraphFunctionPositions.showByCurrentFunction) {
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();
}
}
}

2
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
View File

@@ -36,7 +36,7 @@ public class FunctionsGraphUI extends mxGraph {
public final static Timer ffTimer = new Timer(1000, new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();
}
});
//---

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

@@ -2,6 +2,7 @@ package _VisualDVM.Repository.BugReport;
import _VisualDVM.Current;
import Common.Database.Tables.DBTable;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
@@ -49,7 +50,7 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
}
@Override
public void MouseAction2() throws Exception {
Pass.passes.get(PassCode.OpenBugReportTestProject).Do();
Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
}
@Override
public void CreateControl() {
@@ -61,7 +62,7 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
control.getActionMap().put(solve, new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Pass.passes.get(PassCode.OpenBugReportTestProject).Do();
Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
}
});
}

16
src/_VisualDVM/Repository/Component/ComponentsMenuBar.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Repository.Component;
import Common.Visual.UI_;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI_;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.VisualiserMenu;
public class ComponentsMenuBar extends DataMenuBar {
public ComponentsMenuBar() {
super("компоненты");
@@ -13,15 +13,17 @@ public class ComponentsMenuBar extends DataMenuBar {
"Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
{
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
add(Pass.passes.get(PassCode.ResurrectComponent).createMenuItem());
add(Pass.passes.get(PassCode.ResurrectComponentFromServer).createMenuItem());
add( Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem());
add( Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem());
}
}
);
addPasses(PassCode.InstallComponentFromFolder,
PassCode.UpdateSelectedComponents,
PassCode.PublishComponent,
PassCode.ShowComponentChangesLog);
Pass.passes.get(PassCode.PublishComponent).setControlsVisible(false);
Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
}
}

12
src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
View File

@@ -315,7 +315,7 @@ public abstract class Sapfor extends OSDComponent {
DBProjectFile cuf = null;
if (Global.mainModule.HasFile()) {
cuf = Global.mainModule.getFile();
Pass.passes.get(PassCode.CloseCurrentFile).Do();
Global.mainModule.getPass(PassCode.CloseCurrentFile).Do();
}
if (mode) //модификация
{
@@ -339,23 +339,23 @@ public abstract class Sapfor extends OSDComponent {
} else UI_.Info("Сохранение файлов отсутствует.");
}
if (cuf != null)
Pass.passes.get(PassCode.OpenCurrentFile).Do(cuf);
Global.mainModule.getPass(PassCode.OpenCurrentFile).Do(cuf);
}
//</editor-fold>
public Visual_DVM_2021.Passes.SapforAnalysis getAnalysisByPhase(String phase) {
for (PassCode analysis_code : getAnalysesCodes()) {
Visual_DVM_2021.Passes.SapforAnalysis analysis = (Visual_DVM_2021.Passes.SapforAnalysis) Pass.passes.get(analysis_code);
Visual_DVM_2021.Passes.SapforAnalysis analysis = (Visual_DVM_2021.Passes.SapforAnalysis) Global.mainModule.getPass(analysis_code);
if (analysis.phase().equals(phase)) return analysis;
}
return null;
}
public void ResetAllAnalyses() {
for (PassCode code : getAnalysesCodes())
(Pass.passes.get(code)).Reset();
( Global.mainModule.getPass(code)).Reset();
//------------------------------------------------------------------------------------------>>>> пакетный режим.
if (UI_.isActive()) {
Pass.passes.get(PassCode.Precompilation).Reset();
Pass.passes.get(PassCode.SPF_GetGCovInfo).Reset();
Global.mainModule.getPass(PassCode.Precompilation).Reset();
Global.mainModule.getPass(PassCode.SPF_GetGCovInfo).Reset();
}
Global.enable_text_changed = false;
Global.transformationPermission = TransformationPermission.None;

2
src/_VisualDVM/Repository/Component/Visualiser.java
View File

@@ -81,7 +81,7 @@ public class Visualiser extends Component {
if (workspace.exists())
return workspace;
else
Pass.passes.get(PassCode.UpdateSetting).Do(
Global.mainModule.getPass(PassCode.UpdateSetting).Do(
SettingName.Workspace, "");
}
return Global.ProjectsDirectory;

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

@@ -1,13 +1,14 @@
package _VisualDVM.TestingSystem.Common.Test.UI;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
public class AddTestMenu extends VisualiserMenu {
public AddTestMenu() {
super("Добавление теста", "/icons/RedAdd.png", false);
add(Pass.passes.get(PassCode.CreateTestFromProject).createMenuItem());
add(Pass.passes.get(PassCode.CreateTestFromDirectory).createMenuItem());
add(Pass.passes.get(PassCode.CreateTestsFromFiles).createMenuItem());
add(Pass.passes.get(PassCode.CreateTestFromSelectedFiles).createMenuItem());
add(Global.mainModule.getPass(PassCode.CreateTestFromProject).createMenuItem());
add(Global.mainModule.getPass(PassCode.CreateTestFromDirectory).createMenuItem());
add(Global.mainModule.getPass(PassCode.CreateTestsFromFiles).createMenuItem());
add(Global.mainModule.getPass(PassCode.CreateTestFromSelectedFiles).createMenuItem());
}
}

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

@@ -1,11 +1,11 @@
package _VisualDVM.TestingSystem.Common.Test.UI;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.VisualiserMenu;
public class EditTestMenu extends VisualiserMenu {
public EditTestMenu() {
super("Редактирование теста", "/icons/Edit.png", false);
add(Pass.passes.get(PassCode.EditTest).createMenuItem());
add(Pass.passes.get(PassCode.ReplaceTestProject).createMenuItem());
add( Global.mainModule.getPass(PassCode.EditTest).createMenuItem());
add( Global.mainModule.getPass(PassCode.ReplaceTestProject).createMenuItem());
}
}

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

@@ -154,7 +154,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
public static Timer checkTimer = null;
public static void TimerOn() {
checkTimer = new Timer(Global.properties.CheckTestingIntervalSeconds * 1000, e -> {
Pass.passes.get(PassCode.ActualizePackages).Do();
Global.mainModule.getPass(PassCode.ActualizePackages).Do();
});
checkTimer.start();
}

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

@@ -63,7 +63,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
}
@Override
public void MouseAction2() throws Exception {
Pass.passes.get(PassCode.DownloadDVMPackage).Do();
Global.mainModule.getPass(PassCode.DownloadDVMPackage).Do();
}
};

4
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
View File

@@ -39,7 +39,7 @@ public class DVMSettingsFields implements DialogFields {
bAddFlags.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass pass = Pass.passes.get(PassCode.PickCompilerOptions);
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
if (pass.Do(Global.mainModule.getCompiler())) {
tfFlags.setText((String)pass.target);
}
@@ -48,7 +48,7 @@ public class DVMSettingsFields implements DialogFields {
bAddEnvironments.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass pass = Pass.passes.get(PassCode.PickCompilerEnvironmentsForTesting);
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerEnvironmentsForTesting);
if (pass.Do(Global.mainModule.getCompiler()))
tfEnvironments.setText((String)pass.target);
}

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

@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforPackage;
import _VisualDVM.Current;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Global;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import Visual_DVM_2021.Passes.PassCode;
@@ -46,7 +47,7 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
}
@Override
public void MouseAction2() throws Exception {
Pass.passes.get(PassCode.CompareSapforPackages).Do();
Global.mainModule.getPass(PassCode.CompareSapforPackages).Do();
}
};
}

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

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

@@ -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.passes.get(PassCode.ApplyBugReportSettings).createButton());
settingsTools.add(Global.mainModule.getPass(PassCode.ApplyBugReportSettings).createButton());
//-
if (!Pass.passes.get(PassCode.CheckAccount).isDone()) {
accountTools.add(Pass.passes.get(PassCode.CheckAccount).createButton());
if (!Global.mainModule.getPass(PassCode.CheckAccount).isDone()) {
accountTools.add(Global.mainModule.getPass(PassCode.CheckAccount).createButton());
}
//--
BugReportsKeyFilter.getDocument().addDocumentListener(new DocumentListener() {
@@ -276,9 +276,9 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
});
//-
accountTools.addSeparator();
accountTools.add(Pass.passes.get(PassCode.StartComponentsServer).createButton());
accountTools.add(Pass.passes.get(PassCode.ShutdownComponentsServer).createButton());
accountTools.add(Pass.passes.get(PassCode.PublishComponentsServer).createButton());
accountTools.add(Global.mainModule.getPass(PassCode.StartComponentsServer).createButton());
accountTools.add(Global.mainModule.getPass(PassCode.ShutdownComponentsServer).createButton());
accountTools.add(Global.mainModule.getPass(PassCode.PublishComponentsServer).createButton());
}
//-------------------------------------------
DescriptionTabs descriptionTabs = new DescriptionTabs();
@@ -374,62 +374,20 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
@Override
public void setUserRights() {
LockMyOnly();
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.passes.get(PassCode.ShutdownComponentsServer).setControlsVisible(false);
Pass.passes.get(PassCode.StartComponentsServer).setControlsVisible(false);
Pass.passes.get(PassCode.PublishComponentsServer).setControlsVisible(false);
//
Pass.passes.get(PassCode.ShutdownTestingServer).setControlsVisible(false);
Pass.passes.get(PassCode.StartTestingServer).setControlsVisible(false);
Pass.passes.get(PassCode.PublishTestingServer).setControlsVisible(false);
Global.mainModule.SetUserAccess();
UI.testingBar.showServerAdminLabel(false);
adminLabel.setVisible(false);
}
private void setDeveloperRights() {
UnlockMyOnly();
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.passes.get(PassCode.ShutdownComponentsServer).setControlsVisible(false);
Pass.passes.get(PassCode.StartComponentsServer).setControlsVisible(false);
Pass.passes.get(PassCode.PublishComponentsServer).setControlsVisible(false);
//
Pass.passes.get(PassCode.ShutdownTestingServer).setControlsVisible(false);
Pass.passes.get(PassCode.StartTestingServer).setControlsVisible(false);
Pass.passes.get(PassCode.PublishTestingServer).setControlsVisible(false);
Global.mainModule.SetDeveloperAccess();
UI.testingBar.showServerAdminLabel(false);
adminLabel.setVisible(false);
}
@Override
public void setAdminRights() {
UnlockMyOnly();
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.passes.get(PassCode.ShutdownComponentsServer).setControlsVisible(true);
Pass.passes.get(PassCode.StartComponentsServer).setControlsVisible(true);
Pass.passes.get(PassCode.PublishComponentsServer).setControlsVisible(true);
//--
Pass.passes.get(PassCode.ShutdownTestingServer).setControlsVisible(true);
Pass.passes.get(PassCode.StartTestingServer).setControlsVisible(true);
Pass.passes.get(PassCode.PublishTestingServer).setControlsVisible(true);
Global.mainModule.SetAdminAccess();
//--
UI.testingBar.showServerAdminLabel(true);
adminLabel.setVisible(true);

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

@@ -1,8 +1,8 @@
package _VisualDVM.Visual.Windows;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.Visual.Interface.CommentInterface;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import javax.swing.*;
public class CommentFields implements CommentInterface {
@@ -14,8 +14,8 @@ public class CommentFields implements CommentInterface {
private JPanel additionPanel;
public CommentFields() {
LoadSplitters();
commentTools.add(Pass.passes.get(PassCode.SaveBugReportComment).createButton());
commentAdditionTools.add(Pass.passes.get(PassCode.AppendBugReportComment).createButton());
commentTools.add( Global.mainModule.getPass(PassCode.SaveBugReportComment).createButton());
commentAdditionTools.add( Global.mainModule.getPass(PassCode.AppendBugReportComment).createButton());
}
@Override
public void setEditorScroll(JScrollPane scroll_in) {

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

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Windows;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
@@ -14,8 +15,8 @@ public class DescriptionFields implements DescriptionInterface {
private JPanel additionPanel;
public DescriptionFields() {
LoadSplitters();
descriptionAdditionTools.add(Pass.passes.get(PassCode.AppendBugReportDescription).createButton());
descriptionTools.add(Pass.passes.get(PassCode.SaveBugReportDescription).createButton());
descriptionAdditionTools.add(Global.mainModule.getPass(PassCode.AppendBugReportDescription).createButton());
descriptionTools.add(Global.mainModule.getPass(PassCode.SaveBugReportDescription).createButton());
}
//---------
@Override

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

@@ -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.passes.get(PassCode.Save).setControlsEnabled(false);
Global.mainModule.getPass(PassCode.Save).setControlsEnabled(false);
//-
if (Global.properties.collapseFileGraphs)
CollapseGraphs();

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

@@ -101,7 +101,7 @@ public class FunctionsForm implements FunctionsWindow {
bSaveGraphAsImage.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass.passes.get(PassCode.SaveGraph).Do();
Global.mainModule.getPass(PassCode.SaveGraph).Do();
}
});
sIterations.setModel(new SpinnerNumberModel(Global.mainModule.getProject().fgIterations,
@@ -156,36 +156,36 @@ public class FunctionsForm implements FunctionsWindow {
ShowStandardFilter.addActionListener(e -> {
SPF_GetGraphFunctionPositions.showStandardFunctions = ShowStandardFilter.isSelected();
FunctionsGraphUI.ffTimer.stop();
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();
});
ShowExternalFilter.addActionListener(e -> {
SPF_GetGraphFunctionPositions.showExternalFunctions = ShowExternalFilter.isSelected();
FunctionsGraphUI.ffTimer.stop();
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();
});
ShowUnreachableFilter.addActionListener(e -> {
SPF_GetGraphFunctionPositions.showUnreachableFunctions = ShowUnreachableFilter.isSelected();
FunctionsGraphUI.ffTimer.stop();
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();
});
cbShowByCurrentFunction.addActionListener(e -> {
SPF_GetGraphFunctionPositions.showByCurrentFunction = cbShowByCurrentFunction.isSelected();
FunctionsGraphUI.ffTimer.stop();
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();
});
ShowIn.addActionListener(e -> {
SPF_GetGraphFunctionPositions.showIn = ShowIn.isSelected();
FunctionsGraphUI.ffTimer.stop();
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();
});
ShowOut.addActionListener(e -> {
SPF_GetGraphFunctionPositions.showOut = ShowOut.isSelected();
FunctionsGraphUI.ffTimer.stop();
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();
});
//---------------------------------------------------------
filtersBar.add(Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).createButton(), 0);
filtersBar.add(Pass.passes.get(PassCode.ApplyCurrentFunction).createButton(), 6);
filtersBar.add( Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).createButton(), 0);
filtersBar.add( Global.mainModule.getPass(PassCode.ApplyCurrentFunction).createButton(), 6);
filtersBar.setPreferredSize(new Dimension(0,30));
}
private void createUIComponents() {

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

@@ -51,7 +51,7 @@ public class MainForm extends Form implements MainWindow {
}
@Override
public void AfterClose() {
Pass.passes.get(PassCode.CloseCurrentProject).Do();
Global.mainModule.getPass(PassCode.CloseCurrentProject).Do();
if (UI.getVersionsWindow() != null)
((VersionsForm) UI.getVersionsWindow()).SaveSplitters();
SaveCallbackPanel();

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

@@ -183,7 +183,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
else if (Global.mainModule.getProject().db.files.containsKey(fileName)) {
DBProjectFile targetFile = Global.mainModule.getProject().db.files.get(fileName);
targetFile.UpdateLastLine(line);
Pass.passes.get(PassCode.OpenCurrentFile).Do(targetFile);
Global.mainModule.getPass(PassCode.OpenCurrentFile).Do(targetFile);
}
}
@Override
@@ -231,7 +231,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
RefreshProjectFiles();
DBProjectFile badFile = Global.mainModule.getProject().getFirstBadFile();
if (badFile != null) {
Pass.passes.get(PassCode.OpenCurrentFile).Do(badFile);
Global.mainModule.getPass(PassCode.OpenCurrentFile).Do(badFile);
UI.getMainWindow().FocusProject();
UI.getMainWindow().getProjectWindow().FocusFile();
}

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

@@ -72,7 +72,7 @@ public class SapforPackagesComparisonForm {
TextLog log = new TextLog();
if (Global.mainModule.Check(log, Current.SapforPackage)) {
object = Global.mainModule.getSapforPackage();
if (object.isLoaded() || (Pass.passes.get(PassCode.DownloadSapforPackage).Do(object))) {
if (object.isLoaded() || ( Global.mainModule.getPass(PassCode.DownloadSapforPackage).Do(object))) {
showObject();
}
} else
@@ -81,7 +81,7 @@ public class SapforPackagesComparisonForm {
public void ApplyObject(DBObject object_in) {
RemoveObject();
object = (SapforPackage) object_in;
if (object.isLoaded() || (Pass.passes.get(PassCode.DownloadSapforPackage).Do(object))) {
if (object.isLoaded() || ( Global.mainModule.getPass(PassCode.DownloadSapforPackage).Do(object))) {
showObject();
}
}

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

@@ -35,7 +35,7 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
bApplyObject.setVisible(false);
bClose.setVisible(false);
cbFile = new JComboBox<>();
tools.add(Pass.passes.get(
tools.add( Global.mainModule.getPass(
(current.equals(Current.SapforEtalonVersion) ? PassCode.OpenSapforEtalonVersion : PassCode.OpenSapforVersion
)).createButton(), 3);
tools.add(cbFile, 4);

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

@@ -174,7 +174,7 @@ public class SearchReplaceForm extends Form {
if (selectedFile != null) {
Pair<String, Long> info = (Pair<String, Long>) selectedFile.getUserObject();
if (Global.mainModule.getProject().db.files.containsKey(info.getKey())) {
Pass.passes.get(PassCode.OpenCurrentFile).Do(Global.mainModule.getProject().db.files.get(info.getKey()));
Global.mainModule.getPass(PassCode.OpenCurrentFile).Do(Global.mainModule.getProject().db.files.get(info.getKey()));
//--->>>
replaceOn.setSelected(false);
setMode(false);

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

@@ -1,7 +1,7 @@
package _VisualDVM.Visual.Windows;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import javax.swing.*;
import java.awt.event.MouseAdapter;
@@ -17,7 +17,7 @@ public class TabToolBar extends VisualiserMenuBar {
addSeparator();
//-
for (PassCode code : passes)
add(Pass.passes.get(code).createTabButton());
add( Global.mainModule.getPass(code).createTabButton());
MouseAdapter adapter = new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {

4
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;
import Common.Passes.Pass;
import _VisualDVM.Global;
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.passes.get(PassCode.OpenCurrentProject).Do(files[0]);
Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(files[0]);
}
});
}