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

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

@@ -156,7 +156,7 @@ public class SapforAnalysis extends SapforPass {
}
@Override
protected void FocusResult() {
UI.getMainWindow().FocusProject();
Global.mainModule.getUI().getMainWindow().FocusProject();
}
@Override
protected void unpackMessages() throws Exception {

View File

@@ -19,8 +19,8 @@ public class SapforPass extends SilentSapforPass {
}
@Override
protected void showFinish() throws Exception {
UI.getMainWindow().getProjectWindow().RefreshProjectTreeAndMessages();
UI.getMainWindow().getProjectWindow().ShowProjectSapforLog();
Global.mainModule.getUI().getMainWindow().getProjectWindow().RefreshProjectTreeAndMessages();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowProjectSapforLog();
}
@Override
public void Interrupt() throws Exception {

View File

@@ -67,7 +67,7 @@ public class SapforTransformation extends SapforPass {
}
@Override
protected void FocusResult() {
UI.getMainWindow().getProjectWindow().FocusVersions();
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusVersions();
}
@Override
protected void performFail() throws Exception {
@@ -78,7 +78,7 @@ public class SapforTransformation extends SapforPass {
protected void showFinish() throws Exception {
super.showFinish();
Global.mainModule.set(Current.ProjectView, ProjectView.Files);
UI.getMainWindow().getProjectWindow().ShowProjectView();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowProjectView();
}
@Override
protected boolean canStart(Object... args) throws Exception {

View File

@@ -35,13 +35,13 @@ public class Transformation extends CurrentProjectPass {
}
@Override
protected void FocusResult() {
UI.getMainWindow().getProjectWindow().FocusVersions();
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusVersions();
}
@Override
protected void showFinish() throws Exception {
super.showFinish();
Global.mainModule.set(Current.ProjectView, ProjectView.Files);
UI.getMainWindow().getProjectWindow().ShowProjectView();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowProjectView();
}
@Override
protected void performDone() throws Exception {

View File

@@ -50,15 +50,15 @@ public abstract class VariantsMassPass extends CurrentProjectPass {
}
@Override
protected void showFinish() throws Exception {
UI.getVersionsWindow().getVariantsWindow().RefreshVariants();
UI.getMainWindow().getProjectWindow().RefreshProjectFiles();
UI.getMainWindow().getProjectWindow().ShowProjectSapforLog();
Global.mainModule.getUI().getVersionsWindow().getVariantsWindow().RefreshVariants();
Global.mainModule.getUI().getMainWindow().getProjectWindow().RefreshProjectFiles();
Global.mainModule.getUI().getMainWindow().getProjectWindow().ShowProjectSapforLog();
//-
DBProjectFile badFile = target.getFirstBadFile();
if (badFile != null) {
Global.mainModule.getPass(PassCode.OpenCurrentFile).Do(badFile);
UI.getMainWindow().FocusProject();
UI.getMainWindow().getProjectWindow().FocusFile();
Global.mainModule.getUI().getMainWindow().FocusProject();
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusFile();
}
//-
if (Global.mainModule.HasFile())