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

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