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

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]);
}
});
}