рефакторинг хранения окон

This commit is contained in:
2024-10-15 02:32:52 +03:00
parent 1f6cc4a579
commit 2999390b91
105 changed files with 421 additions and 318 deletions

View File

@@ -63,7 +63,7 @@ public class AddFile extends ChangeFilePass<DBProjectFile> {
if (mode == Mode.Dialog) Utils.WriteToFile(target.file, "");
else FileUtils.copyFile(src, dst);
project.db.Insert(target);
UI.getMainWindow().getProjectWindow().getFilesTreeForm().getTree().AddNode(parent_node,
Global.mainModule.getUI().getMainWindow().getProjectWindow().getFilesTreeForm().getTree().AddNode(parent_node,
dst_node = target.node = new DefaultMutableTreeNode(target)
);
}

View File

@@ -5,12 +5,12 @@ public class AppendBugReportComment extends AppendBugReportField {
@Override
protected boolean canStart(Object... args) throws Exception {
return super.canStart("comment",
UI.getMainWindow().getCallbackWindow().getBugReportCommentAdditionText());
Global.mainModule.getUI().getMainWindow().getCallbackWindow().getBugReportCommentAdditionText());
}
@Override
protected void performDone() throws Exception {
super.performDone();
UI.getMainWindow().getCallbackWindow().ClearBugReportCommentAdditionText();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ClearBugReportCommentAdditionText();
}
@Override
protected boolean canUpdate() {

View File

@@ -1,14 +1,15 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class AppendBugReportDescription extends AppendBugReportField {
@Override
protected boolean canStart(Object... args) throws Exception {
return super.canStart("description",
UI.getMainWindow().getCallbackWindow().getBugReportDescriptionAdditionText());
Global.mainModule.getUI().getMainWindow().getCallbackWindow().getBugReportDescriptionAdditionText());
}
@Override
protected void performDone() throws Exception {
super.performDone();
UI.getMainWindow().getCallbackWindow().ClearBugReportDescriptionAdditionText();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ClearBugReportDescriptionAdditionText();
}
}

View File

@@ -64,7 +64,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
@Override
protected void showFinish() throws Exception {
server.db.bugReports.RefreshUI();
UI.getMainWindow().getCallbackWindow().ShowCurrentBugReport();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
@Override
protected void performDone() throws Exception {

View File

@@ -40,7 +40,7 @@ public class ApplyCurrentFunction extends Pass {
}
@Override
protected void showDone() throws Exception {
UI.getMainWindow().getProjectWindow().getFunctionsWindow().ShowCurrentFunction();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getFunctionsWindow().ShowCurrentFunction();
if (SPF_GetGraphFunctionPositions.showByCurrentFunction) {
Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();
}

View File

@@ -55,10 +55,10 @@ public class CheckAccount extends Pass<Boolean> {
}
@Override
protected void showDone() throws Exception {
if (UI.getMainWindow() != null) {
UI.getMainWindow().getCallbackWindow().ShowAccount();
if (Global.mainModule.getUI().getMainWindow() != null) {
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowAccount();
if (Global.mainModule.HasBugReport())
UI.getMainWindow().getCallbackWindow().ShowCurrentBugReport();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
if (Global.mainModule.getAccount().isAdmin())
Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(true);

View File

@@ -17,9 +17,9 @@ public class CleanAnalyses extends CurrentProjectPass {
@Override
protected void showDone() throws Exception {
super.showDone();
UI.getMainWindow().getProjectWindow().RefreshProjectFiles();
UI.getMainWindow().getProjectWindow().ShowNoAnalyses();
UI.getMainWindow().getProjectWindow().ShowProjectSapforLog();
Global.mainModule.getUI().getMainWindow().getProjectWindow().RefreshProjectFiles();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowNoAnalyses();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowProjectSapforLog();
if (Global.mainModule.HasFile()) {
Global.mainModule.getFile().form.ShowNoMessages();
Global.mainModule.getFile().form.ShowNoAnalyses();

View File

@@ -30,7 +30,7 @@ public class CloseCurrentFile extends Pass<DBProjectFile> {
target.form.SaveSplitters();
target.UpdateLastLine(target.form.getEditor().getCurrentLine());
Global.mainModule.getPass(PassCode.Save).Do();
UI.getSearchReplaceWindow().ClearMarkers();
Global.mainModule.getUI().getSearchReplaceWindow().ClearMarkers();
target.form = null;
}
@Override
@@ -40,6 +40,6 @@ public class CloseCurrentFile extends Pass<DBProjectFile> {
@Override
protected void showDone() throws Exception {
//отобразить отсутствие файла.
UI.getMainWindow().getProjectWindow().ShowNoFile();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowNoFile();
}
}

View File

@@ -31,7 +31,7 @@ public class CloseCurrentProject extends Pass<db_project_info> {
@Override
protected void body() throws Exception {
target.Close();
UI.HideSearchForm();
Global.mainModule.getUI().HideSearchForm();
}
@Override
protected void performDone() throws Exception {
@@ -44,10 +44,10 @@ public class CloseCurrentProject extends Pass<db_project_info> {
}
@Override
protected void showDone() throws Exception {
if (UI.HasMainWindow()) {
UI.getMainWindow().ShowNoProject();
UI.getVersionsWindow().ShowNoProjectVariants();
UI.getVersionsWindow().BlockVariants();
if (Global.mainModule.getUI().hasMainWindow()) {
Global.mainModule.getUI().getMainWindow().ShowNoProject();
Global.mainModule.getUI().getVersionsWindow().ShowNoProjectVariants();
Global.mainModule.getUI().getVersionsWindow().BlockVariants();
}
}
}

View File

@@ -50,8 +50,8 @@ public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {
@Override
protected void body() throws Exception {
if (slave != null)
UI.getMainWindow().getTestingWindow().CompareDVMRunTasks(master, slave);
Global.mainModule.getUI().getMainWindow().getTestingWindow().CompareDVMRunTasks(master, slave);
else
UI.getMainWindow().getTestingWindow().ShowDVMRunTask(master);
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowDVMRunTask(master);
}
}

View File

@@ -50,9 +50,9 @@ public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
@Override
protected void body() throws Exception {
if (slave != null)
UI.getMainWindow().getTestingWindow().CompareSapforPackages(master, slave);
Global.mainModule.getUI().getMainWindow().getTestingWindow().CompareSapforPackages(master, slave);
else
UI.getMainWindow().getTestingWindow().ShowSapforPackage(master);
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowSapforPackage(master);
}
}

View File

@@ -84,6 +84,6 @@ public class Compile extends Pass<db_project_info> {
@Override
protected void showFinish() throws Exception {
Global.mainModule.getDb().compilationTasks.ShowUI(compilationTask.getPK());
UI.getDebugWindow().ShowLastCompilationTask();
Global.mainModule.getUI().getDebugWindow().ShowLastCompilationTask();
}
}

View File

@@ -36,6 +36,6 @@ public class CreateEmptyDirectory extends ChangeFilePass {
@Override
protected void body() throws Exception {
if (!dst.mkdir()) throw new PassException("Не удалось создать папку.");
UI.getMainWindow().getProjectWindow().getFilesTreeForm().getTree().AddNode(parent_node, dst_node = new DefaultMutableTreeNode(dst));
Global.mainModule.getUI().getMainWindow().getProjectWindow().getFilesTreeForm().getTree().AddNode(parent_node, dst_node = new DefaultMutableTreeNode(dst));
}
}

View File

@@ -1,4 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.VariantsMassPass;
import _VisualDVM.ProjectData.Project.db_project_info;
@@ -18,7 +19,7 @@ public class CreateParallelVariants extends VariantsMassPass {
}
@Override
protected void FocusResult() {
UI.getMainWindow().getProjectWindow().FocusVersions();
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusVersions();
}
@Override
protected void performPreparation() throws Exception {

View File

@@ -133,7 +133,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
}
@Override
protected void showFinish() throws Exception {
UI.getMainWindow().getProjectWindow().RefreshProjectTreeAndMessages();
Global.mainModule.getUI().getMainWindow().getProjectWindow().RefreshProjectTreeAndMessages();
if (Global.mainModule.HasFile()) {
Global.mainModule.getFile().form.ShowCompilationOutput();
if (!output.isEmpty())

View File

@@ -11,7 +11,7 @@ public class DeleteDVMPackage extends DeleteTestingPackages<DVMPackage> {
}
protected void showPreparation() throws Exception {
super.showPreparation();
UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison();
Global.mainModule.getUI().getMainWindow().getTestingWindow().DropTestRunTasksComparison();
}
@Override
protected File getPackagesHome() {

View File

@@ -42,7 +42,7 @@ public class DeleteDirectory extends ChangeFilePass {
protected void body() throws Exception {
FileUtils.deleteDirectory(target_dir);
if (target_dir.exists()) throw new PassException("Не удалось удалить папку");
UI.getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RemoveNode(dst_node);
Global.mainModule.getUI().getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RemoveNode(dst_node);
Vector<DBProjectFile> to_delete = new Vector<>();
for (DBProjectFile file : project.db.files.Data.values()) {
if (Utils.isAnchestor(file.file, target_dir))

View File

@@ -26,7 +26,7 @@ public class DeleteFile extends ChangeFilePass<DBProjectFile> {
}
@Override
protected void body() throws Exception {
UI.getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RemoveNode(target.node);
Global.mainModule.getUI().getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RemoveNode(target.node);
project.db.Delete(target);
Utils_.forceDeleteWithCheck(target.file);
}

View File

@@ -11,7 +11,7 @@ public class DeleteSapforPackage extends DeleteTestingPackages<SapforPackage> {
}
protected void showPreparation() throws Exception {
super.showPreparation();
UI.getMainWindow().getTestingWindow().DropSapforComparison();
Global.mainModule.getUI().getMainWindow().getTestingWindow().DropSapforComparison();
}
@Override
protected File getPackagesHome() {

View File

@@ -47,7 +47,7 @@ public class DeleteSelectedFiles extends Pass {
protected void body() throws Exception {
for (DBProjectFile file : Global.mainModule.getProject().db.files.getCheckedItems()) {
ShowMessage1(file.name);
UI.getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RemoveNode(file.node);
Global.mainModule.getUI().getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RemoveNode(file.node);
Global.mainModule.getProject().db.Delete(file);
Utils_.forceDeleteWithCheck(file.file);
}

View File

@@ -40,7 +40,7 @@ public class DeleteVersion extends Pass<db_project_info> {
Global.mainModule.getPass(PassCode.CloseCurrentProject).Do();
}
if (UI_.isActive()) {
UI.getVersionsWindow().RemoveVersionFromComparison(target);
Global.mainModule.getUI().getVersionsWindow().RemoveVersionFromComparison(target);
}
}
@Override
@@ -53,7 +53,7 @@ public class DeleteVersion extends Pass<db_project_info> {
if (current)
Global.mainModule.set(Current.Version, null);
if (parent != null) {
UI.getVersionsWindow().getVersionsForm().getTree().RemoveNode(target.node);
Global.mainModule.getUI().getVersionsWindow().getVersionsForm().getTree().RemoveNode(target.node);
parent.versions.remove(target.name);
} else
Global.mainModule.set(Current.Root, null);

View File

@@ -24,7 +24,7 @@ public class DownloadDVMPackage extends DownloadDVMPackages {
return false;
}
if (new File(dvmPackage.getLocalWorkspace(), Constants.LOADED).exists()) {
UI.getMainWindow().getTestingWindow().ShowDVMPackage(dvmPackage);
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowDVMPackage(dvmPackage);
Global.testingServer.db.dvmRunTasks.ShowDVMPackage(dvmPackage);
return false;
}
@@ -36,7 +36,7 @@ public class DownloadDVMPackage extends DownloadDVMPackages {
}
@Override
protected void showDone() throws Exception {
UI.getMainWindow().getTestingWindow().ShowDVMPackage(dvmPackage);
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowDVMPackage(dvmPackage);
Global.testingServer.db.dvmRunTasks.ShowDVMPackage(dvmPackage);
}
}

View File

@@ -20,7 +20,7 @@ public class DownloadProject extends CurrentConnectionPass {
File local_archive;
@Override
protected void ServerAction() throws Exception {
dialogOK = (UI.getRemoteFileChooser().ShowDialog(getDescription(), this, true));
dialogOK = (Global.mainModule.getUI().getRemoteFileChooser().ShowDialog(getDescription(), this, true));
if (dialogOK) {
src = Global.mainModule.getRemoteFile();
remote_archive = new RemoteFile(src.full_name, src.name + ".zip", false);

View File

@@ -25,6 +25,6 @@ public class ExcludeFile extends Pass<DBProjectFile> {
}
@Override
protected void showDone() throws Exception {
UI.getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RefreshNode(target.node);
Global.mainModule.getUI().getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RefreshNode(target.node);
}
}

View File

@@ -1,5 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Project.CurrentProjectPass;
import _VisualDVM.Visual.UI;
@@ -17,7 +18,7 @@ public class GenerateParallelVariants extends CurrentProjectPass {
}
@Override
protected void FocusBeforeStart() {
UI.getMainWindow().getProjectWindow().FocusVersions();
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusVersions();
}
@Override
protected boolean canStart(Object... args) throws Exception {
@@ -38,7 +39,7 @@ public class GenerateParallelVariants extends CurrentProjectPass {
}
@Override
protected void showPreparation() throws Exception {
UI.getVersionsWindow().getVariantsWindow().ShowNoVariants();
Global.mainModule.getUI().getVersionsWindow().getVariantsWindow().ShowNoVariants();
}
@Override
protected void body() throws Exception {
@@ -49,6 +50,6 @@ public class GenerateParallelVariants extends CurrentProjectPass {
}
@Override
protected void showDone() throws Exception {
UI.getVersionsWindow().getVariantsWindow().ShowVariants();
Global.mainModule.getUI().getVersionsWindow().getVariantsWindow().ShowVariants();
}
}

View File

@@ -25,6 +25,6 @@ public class IncludeFile extends Pass<DBProjectFile> {
}
@Override
protected void showDone() throws Exception {
UI.getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RefreshNode(target.node);
Global.mainModule.getUI().getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RefreshNode(target.node);
}
}

View File

@@ -26,6 +26,6 @@ public class OpenCurrentFile extends Pass<DBProjectFile> {
@Override
protected void showDone() throws Exception {
//отобразить новый текущий файл.
UI.getMainWindow().getProjectWindow().ShowFile();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowFile();
}
}

View File

@@ -126,17 +126,17 @@ public class OpenCurrentProject extends Pass<db_project_info> {
@Override
protected void showDone() throws Exception {
if (root_changes)
UI.CreateVersionsWindow();
UI.getVersionsWindow().ShowProjectVariants();
UI.getVersionsWindow().BlockVariants();
Global.mainModule.getUI().CreateVersionsWindow();
Global.mainModule.getUI().getVersionsWindow().ShowProjectVariants();
Global.mainModule.getUI().getVersionsWindow().BlockVariants();
//-
UI.getMainWindow().ShowProject();
Global.mainModule.getUI().getMainWindow().ShowProject();
//криво. но при тихом режиме открытие файлов все равно не понадобится.
Global.mainModule.getPass(PassCode.OpenCurrentFile).Do(target.getLastOpenedFile());
}
@Override
protected void FocusResult() {
UI.getMainWindow().FocusProject();
Global.mainModule.getUI().getMainWindow().FocusProject();
}
enum Mode {
Undefined,

View File

@@ -176,7 +176,7 @@ public class Precompilation extends Pass<db_project_info> {
}
@Override
protected void showPreparation() throws Exception {
UI.getMainWindow().getProjectWindow().ShowNoAnalyses();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowNoAnalyses();
if (Global.mainModule.HasFile()) {
Global.mainModule.getFile().form.ShowNoMessages();
Global.mainModule.getFile().form.ShowNoAnalyses();
@@ -238,7 +238,7 @@ public class Precompilation extends Pass<db_project_info> {
}
@Override
protected void showFinish() throws Exception {
UI.getMainWindow().getProjectWindow().RefreshProjectTreeAndMessages();
Global.mainModule.getUI().getMainWindow().getProjectWindow().RefreshProjectTreeAndMessages();
if (Global.mainModule.HasFile()) {
Global.mainModule.getFile().form.ShowCompilationOutput();
Global.mainModule.getFile().form.FocusCompilationOut();

View File

@@ -31,7 +31,7 @@ public class PublishBugReport extends Pass<BugReport> {
return false;
}
if (target.executor.isEmpty()) {
UI.getMainWindow().getCallbackWindow().FocusRecipients();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().FocusRecipients();
if (!UI_.Question("Для отчёта об ошибке не назначен исполнитель.\nВсе равно опубликовать его"))
return false;
}
@@ -72,6 +72,6 @@ public class PublishBugReport extends Pass<BugReport> {
@Override
protected void showDone() throws Exception {
Global.componentsServer.db.bugReports.RefreshUI();
UI.getMainWindow().getCallbackWindow().ShowCurrentBugReport();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
}

View File

@@ -113,8 +113,8 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
Global.mainModule.getPass(PassCode.Email).Do(message);
//---
if (target.getComponentType().equals(ComponentType.Sapfor_F) && f.fields.cbAssemblyOnServer.isSelected()) {
UI.getMainWindow().FocusTesting();
UI.getMainWindow().getTestingWindow().FocusSapforTesting();
Global.mainModule.getUI().getMainWindow().FocusTesting();
Global.mainModule.getUI().getMainWindow().getTestingWindow().FocusSapforTesting();
Global.mainModule.getPass(PassCode.CompileServerSapfor).Do();
}
}

View File

@@ -39,7 +39,7 @@ public abstract class PublishTests extends TestingSystemPass<Vector<Test>> {
}
@Override
protected void FocusResult() {
UI.getMainWindow().FocusTests();
Global.mainModule.getUI().getMainWindow().FocusTests();
}
//--
protected abstract PassCode getCreateTestCode();

View File

@@ -87,6 +87,6 @@ public class RenameDirectory extends ChangeFilePass {
}
@Override
protected void showDone() throws Exception {
UI.getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RefreshNode(dst_node);
Global.mainModule.getUI().getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RefreshNode(dst_node);
}
}

View File

@@ -65,6 +65,6 @@ public class RenameFile extends ChangeFilePass<DBProjectFile> {
}
@Override
protected void showDone() throws Exception {
UI.getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RefreshNode(target.node);
Global.mainModule.getUI().getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RefreshNode(target.node);
}
}

View File

@@ -104,13 +104,13 @@ public class Run extends Pass<db_project_info> {
}
//-
Global.mainModule.getDb().runTasks.RefreshUI();
UI.getDebugWindow().ShowCurrentRunTask();
Global.mainModule.getUI().getDebugWindow().ShowCurrentRunTask();
//-
if (!task_completed) break;
++i;
}
if (current_task != null) {
UI.getDebugWindow().ShowLastRunTask();
Global.mainModule.getUI().getDebugWindow().ShowLastRunTask();
}
}
}

View File

@@ -21,7 +21,7 @@ public class SPF_GetAllDeclaratedArrays extends SapforAnalysis {
}
@Override
protected void showPreparation() {
UI.getMainWindow().getProjectWindow().getArraysWindow().ShowNoArrays();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getArraysWindow().ShowNoArrays();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowNoArrays();
}
@@ -54,15 +54,15 @@ public class SPF_GetAllDeclaratedArrays extends SapforAnalysis {
}
@Override
protected void FocusResult() {
UI.getMainWindow().getProjectWindow().FocusArrays();
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusArrays();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.FocusArrays();
}
@Override
protected void showDone() throws Exception {
UI.getMainWindow().getProjectWindow().getArraysWindow().ShowArrays();
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowArraysCount();
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getArraysWindow().ShowArrays();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getAnalysisWindow().ShowArraysCount();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowArrays();
super.showDone();

View File

@@ -18,14 +18,14 @@ public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalys
@Override
protected void showDone() throws Exception {
super.showDone();
UI.getVersionsWindow().UnblockVariants();
UI.getVersionsWindow().getVariantsWindow().ShowVariants();
Global.mainModule.getUI().getVersionsWindow().UnblockVariants();
Global.mainModule.getUI().getVersionsWindow().getVariantsWindow().ShowVariants();
}
@Override
protected void FocusResult() {
super.FocusResult();
UI.getMainWindow().getProjectWindow().FocusVersions();
UI.getVersionsWindow().FocusDistribution();
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusVersions();
Global.mainModule.getUI().getVersionsWindow().FocusDistribution();
}
@Override
protected boolean canStart(Object... args) throws Exception {

View File

@@ -47,27 +47,27 @@ public class SPF_GetArrayDistributionOnlyAnalysis extends SapforAnalysis {
}
@Override
protected void showPreparation() {
UI.getVersionsWindow().getVariantsWindow().ShowNoProjectDistribution();
UI.getVersionsWindow().getVariantsWindow().ShowNoVariantsFilter();
UI.getVersionsWindow().getVariantsWindow().ShowNoVariants();
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowNoRegions();
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowNoProjectMaxDim();
Global.mainModule.getUI().getVersionsWindow().getVariantsWindow().ShowNoProjectDistribution();
Global.mainModule.getUI().getVersionsWindow().getVariantsWindow().ShowNoVariantsFilter();
Global.mainModule.getUI().getVersionsWindow().getVariantsWindow().ShowNoVariants();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getAnalysisWindow().ShowNoRegions();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getAnalysisWindow().ShowNoProjectMaxDim();
}
@Override
protected void showDone() throws Exception {
UI.getVersionsWindow().getVariantsWindow().ShowProjectDistribution();
UI.getVersionsWindow().getVariantsWindow().ShowVariantsFilter();
UI.getVersionsWindow().getVariantsWindow().ShowTotalVariantsCount();
UI.getVersionsWindow().getVariantsWindow().ShowFilteredVariantsCount();
UI.getVersionsWindow().getVariantsWindow().ShowCheckedVariantsCount();
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions();
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowProjectMaxDim();
Global.mainModule.getUI().getVersionsWindow().getVariantsWindow().ShowProjectDistribution();
Global.mainModule.getUI().getVersionsWindow().getVariantsWindow().ShowVariantsFilter();
Global.mainModule.getUI().getVersionsWindow().getVariantsWindow().ShowTotalVariantsCount();
Global.mainModule.getUI().getVersionsWindow().getVariantsWindow().ShowFilteredVariantsCount();
Global.mainModule.getUI().getVersionsWindow().getVariantsWindow().ShowCheckedVariantsCount();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getAnalysisWindow().ShowProjectMaxDim();
super.showDone();
}
@Override
protected void FocusResult() {
UI.getMainWindow().FocusProject();
UI.getMainWindow().getProjectWindow().FocusAnalysis();
Global.mainModule.getUI().getMainWindow().FocusProject();
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusAnalysis();
}
@Override
public String getDescription() {

View File

@@ -1,5 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Utils.Index;
import _VisualDVM.Global;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import _VisualDVM.Visual.UI;
@@ -33,16 +34,16 @@ public class SPF_GetArrayDistributionOnlyRegions extends SapforAnalysis {
}
@Override
protected void showPreparation() {
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowNoRegions();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getAnalysisWindow().ShowNoRegions();
}
@Override
protected void showDone() throws Exception {
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions();
super.showDone();
}
@Override
protected void FocusResult() {
UI.getMainWindow().FocusProject();
UI.getMainWindow().getProjectWindow().FocusAnalysis();
Global.mainModule.getUI().getMainWindow().FocusProject();
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusAnalysis();
}
}

View File

@@ -1,5 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
@@ -17,7 +18,7 @@ public class SPF_GetFileLineInfo extends SapforAnalysis {
}
@Override
protected void showPreparation() throws Exception {
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowNoMetrics();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getAnalysisWindow().ShowNoMetrics();
}
@Override
protected void unpack(String packed) throws Exception {
@@ -44,12 +45,12 @@ public class SPF_GetFileLineInfo extends SapforAnalysis {
}
@Override
protected void showDone() throws Exception {
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowMetrics();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getAnalysisWindow().ShowMetrics();
super.showDone();
}
@Override
protected void FocusResult() {
super.FocusResult();
UI.getMainWindow().getProjectWindow().FocusAnalysis();
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusAnalysis();
}
}

View File

@@ -52,7 +52,7 @@ public class SPF_GetGraphFunctionPositions extends SilentSapforPass {
}
@Override
protected void showPreparation() {
UI.getMainWindow().getProjectWindow().ShowNoFunctions();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowNoFunctions();
}
@Override
protected void performDone() throws Exception {
@@ -125,7 +125,7 @@ public class SPF_GetGraphFunctionPositions extends SilentSapforPass {
return res;
}
public String packFgSettings() {
Pair<Integer, Integer> screenDims = UI.getMainWindow().getProjectWindow().getFunctionsWindow().getFunctionsGraphPanelSizes();
Pair<Integer, Integer> screenDims = Global.mainModule.getUI().getMainWindow().getProjectWindow().getFunctionsWindow().getFunctionsGraphPanelSizes();
int x = (int) (screenDims.getKey() * target.fgScreen);
int y = (int) (screenDims.getValue() * target.fgScreen);
Vector<String> visibleFuncNames = new Vector<>();
@@ -269,6 +269,6 @@ public class SPF_GetGraphFunctionPositions extends SilentSapforPass {
}
@Override
protected void showDone() throws Exception {
UI.getMainWindow().getProjectWindow().ShowFunctions();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowFunctions();
}
}

View File

@@ -18,9 +18,9 @@ public class SPF_GetGraphFunctions extends SapforAnalysis {
protected void showPreparation() {
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowNoFunctions();
UI.getMainWindow().getProjectWindow().ShowNoFunctions();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowNoFunctions();
if (SPF_GetGraphFunctionPositions.showByCurrentFunction)
UI.getMainWindow().getProjectWindow().getFunctionsWindow().ShowNoCurrentFunction();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getFunctionsWindow().ShowNoCurrentFunction();
}
@Override
protected boolean alwaysCheck() {
@@ -132,13 +132,13 @@ public class SPF_GetGraphFunctions extends SapforAnalysis {
super.FocusResult();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.FocusFunctions();
UI.getMainWindow().getProjectWindow().FocusFunctions();
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusFunctions();
}
@Override
protected void showDone() throws Exception {
super.showDone();
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowFunctionsCount();
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getAnalysisWindow().ShowFunctionsCount();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowFunctions();
Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();

View File

@@ -66,8 +66,8 @@ public class SPF_GetGraphLoops extends SapforAnalysis {
}
@Override
protected void showDone() throws Exception {
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowLoopsCount();
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getAnalysisWindow().ShowLoopsCount();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowLoops();
super.showDone();

View File

@@ -95,18 +95,18 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
}
@Override
protected void showDone() throws Exception {
UI.getMainWindow().getProjectWindow().ShowIncludes();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowIncludes();
if (update_current)
Global.mainModule.getFile().form.ShowProperties();
super.showDone();
}
@Override
protected void showPreparation() {
UI.getMainWindow().getProjectWindow().ShowNoIncludes();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowNoIncludes();
}
@Override
protected void FocusResult() {
super.FocusResult();
UI.getMainWindow().getProjectWindow().FocusDependencies();
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusDependencies();
}
}

View File

@@ -51,7 +51,7 @@ public class SPF_InlineProcedures extends SapforTransformation {
}
@Override
protected void FocusBeforeStart() {
UI.getMainWindow().getProjectWindow().FocusPoints();
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusPoints();
}
@Override
protected void performFinish() throws Exception {

View File

@@ -86,6 +86,6 @@ public class SPF_InlineProceduresH extends SapforTransformation {
}
@Override
protected void FocusBeforeStart() {
UI.getMainWindow().getProjectWindow().FocusHierarchy();
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusHierarchy();
}
}

View File

@@ -1,6 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.Selectable;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforTransformation;
import _VisualDVM.ProjectData.SapforData.Includes.DependencyInfo;
@@ -42,6 +43,6 @@ public class SPF_InsertIncludesPass extends SapforTransformation {
}
@Override
protected void FocusBeforeStart() {
UI.getMainWindow().getProjectWindow().FocusDependencies();
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusDependencies();
}
}

View File

@@ -100,6 +100,6 @@ public class SPF_ModifyArrayDistribution extends SapforModification {
//показать журнал.
@Override
protected void showFinish() throws Exception {
UI.getMainWindow().getProjectWindow().ShowProjectSapforLog();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowProjectSapforLog();
}
}

View File

@@ -140,7 +140,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
@Override
protected void showPreparation() throws Exception {
if (!precompilation_done) {
UI.getMainWindow().getProjectWindow().ShowNoAnalyses();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowNoAnalyses();
if (Global.mainModule.HasFile()) {
Global.mainModule.getFile().form.ShowNoMessages();
Global.mainModule.getFile().form.ShowNoAnalyses();
@@ -179,7 +179,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
@Override
protected void showFinish() throws Exception {
super.showFinish();
UI.getMainWindow().getProjectWindow().ShowAllAnalyses();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowAllAnalyses();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowAllAnalyses();
}
@@ -190,7 +190,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
@Override
protected void FocusResult() {
super.FocusResult();
UI.getMainWindow().getProjectWindow().FocusFile();
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusFile();
}
@Override
protected void performFail() throws Exception {

View File

@@ -1,4 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class SaveBugReportComment extends UpdateBugReportField {
@Override
@@ -11,6 +12,6 @@ public class SaveBugReportComment extends UpdateBugReportField {
}
@Override
protected boolean canStart(Object... args) throws Exception {
return super.canStart("comment", UI.getMainWindow().getCallbackWindow().getBugReportCommentText());
return super.canStart("comment", Global.mainModule.getUI().getMainWindow().getCallbackWindow().getBugReportCommentText());
}
}

View File

@@ -1,4 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class SaveBugReportDescription extends UpdateBugReportField {
@Override
@@ -11,6 +12,6 @@ public class SaveBugReportDescription extends UpdateBugReportField {
}
@Override
protected boolean canStart(Object... args) throws Exception {
return super.canStart("description", UI.getMainWindow().getCallbackWindow().getBugReportDescriptionText());
return super.canStart("description", Global.mainModule.getUI().getMainWindow().getCallbackWindow().getBugReportDescriptionText());
}
}

View File

@@ -16,7 +16,7 @@ public class SaveFunctionsGraphCoordinates extends Pass {
}
@Override
protected boolean canStart(Object... args) {
graphForm = UI.getMainWindow().getProjectWindow().getFunctionsWindow().getFunctionsGraphWindow();
graphForm = Global.mainModule.getUI().getMainWindow().getProjectWindow().getFunctionsWindow().getFunctionsGraphWindow();
if (!graphForm.isShown())
Log.Writeln_("Сначала отобразите граф");
if (Global.mainModule.getProject().functionsGraph.isEmpty())

View File

@@ -31,7 +31,7 @@ public class SaveGraph extends Pass<File> {
}
@Override
protected boolean canStart(Object... args) {
graphForm = UI.getMainWindow().getProjectWindow().getFunctionsWindow().getFunctionsGraphWindow();
graphForm = Global.mainModule.getUI().getMainWindow().getProjectWindow().getFunctionsWindow().getFunctionsGraphWindow();
if (!graphForm.isShown())
Log.Writeln_("Сначала отобразите граф");
if (Global.mainModule.getProject().functionsGraph.isEmpty())

View File

@@ -16,7 +16,7 @@ public class SelectRemoteFile extends CurrentConnectionPass {
return false;
}
protected void ServerAction() throws Exception {
dialogOK = (UI.getRemoteFileChooser().ShowDialog("Выбор " + (needs_directory ? "папки" : "файла"), this, needs_directory));
dialogOK = (Global.mainModule.getUI().getRemoteFileChooser().ShowDialog("Выбор " + (needs_directory ? "папки" : "файла"), this, needs_directory));
}
@Override
protected boolean validate() {

View File

@@ -47,8 +47,8 @@ public class SynchronizeBugReports extends ComponentsRepositoryPass<Object> {
}
@Override
protected void showDone() throws Exception {
if (UI.HasMainWindow()) {
UI.getMainWindow().getCallbackWindow().ShowBugReports();
if (Global.mainModule.getUI().hasMainWindow()) {
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowBugReports();
Global.componentsServer.db.bugReports.RestoreLastSelections();
server.db.subscribers.RestoreLastSelections();
server.db.workspaces.RestoreLastSelections();

View File

@@ -61,7 +61,7 @@ public class SynchronizeTests extends TestingSystemPass<Object> {
}
@Override
protected void showDone() throws Exception {
if (UI.HasMainWindow()) {
if (Global.mainModule.getUI().hasMainWindow()) {
//server.db.machines
server.db.dvm_configurations.ShowUI();
server.db.groups.ShowUI();
@@ -72,7 +72,7 @@ public class SynchronizeTests extends TestingSystemPass<Object> {
server.db.sapforSettings.ShowUI();
server.db.dvmSettings.ShowUI();
server.db.RestoreLastSelections(); //---- ? объединить с RestoreCredentials
UI.getMainWindow().ShowCheckedTestsCount();
Global.mainModule.getUI().getMainWindow().ShowCheckedTestsCount();
}
}
}

View File

@@ -54,7 +54,7 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
target.change_date = new Date().getTime();
server.db.Update(target);
server.db.bugReports.RefreshUI();
UI.getMainWindow().getCallbackWindow().ShowCurrentBugReport();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
} else
return canUpdate();
return false;
@@ -86,7 +86,7 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
@Override
protected void showFinish() throws Exception {
Global.componentsServer.db.bugReports.RefreshUI();
UI.getMainWindow().getCallbackWindow().ShowCurrentBugReport();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
@Override
protected void performDone() throws Exception {

View File

@@ -31,15 +31,15 @@ public class UpdateProperty extends Pass<Object> {
switch (name) {
case "collapseCredentials":
if ((boolean) newValue)
UI.getMainWindow().getTestingWindow().CollapseCredentials();
Global.mainModule.getUI().getMainWindow().getTestingWindow().CollapseCredentials();
else
UI.getMainWindow().getTestingWindow().ExpandCredentials();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ExpandCredentials();
break;
case "collapseProjectTrees":
if (Global.mainModule.HasProject()) {
if ((boolean) newValue)
UI.getMainWindow().getProjectWindow().CollapseProjectTrees();
else UI.getMainWindow().getProjectWindow().ExpandProjectTrees();
Global.mainModule.getUI().getMainWindow().getProjectWindow().CollapseProjectTrees();
else Global.mainModule.getUI().getMainWindow().getProjectWindow().ExpandProjectTrees();
}
break;
case "collapseFileGraphs":

View File

@@ -127,9 +127,9 @@ public class UpdateSetting extends Pass<DBSetting> {
Global.mainModule.getProject().declaratedArrays.ShowUI();
break;
case ShowFullTabsNames:
UI.getMainWindow().getTestingWindow().RefreshTabsNames();
Global.mainModule.getUI().getMainWindow().getTestingWindow().RefreshTabsNames();
if (Global.mainModule.HasProject())
UI.getMainWindow().getProjectWindow().RefreshTabsNames();
Global.mainModule.getUI().getMainWindow().getProjectWindow().RefreshTabsNames();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.RefreshTabsNames();
break;
@@ -141,8 +141,8 @@ public class UpdateSetting extends Pass<DBSetting> {
case SmallScreen:
boolean small = target.toBoolean();
if (Global.mainModule.HasProject())
UI.getMainWindow().getProjectWindow().SwitchScreen(small);
UI.getMainWindow().getCallbackWindow().SwitchScreen(small);
Global.mainModule.getUI().getMainWindow().getProjectWindow().SwitchScreen(small);
Global.mainModule.getUI().getMainWindow().getCallbackWindow().SwitchScreen(small);
break;
case Precompilation:
Global.mainModule.getSapfor().ResetAllAnalyses();