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 22:08:13 +03:00
parent 09b64218bd
commit 6afa2dc892
240 changed files with 1472 additions and 1518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,7 +123,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
}
@Override
public void ShowProjectSapforLog() {
logText.setText(Current.getProject().Log);
logText.setText(Global.mainModule.getProject().Log);
logText.setCaretPosition(0);
}
@Override
@@ -154,9 +154,9 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
//filesTabs.setTabComponentAt(0,
// new TabToolBar(Current.getFile().name, PassCode_2021.CloseCurrentFile));
// projectTabs.setTitleAt(0, "Файл: " + Current.getFile().name);
fileBackground.add((Current.getFile().form = new FileForm(Current.getFile())).getContent());
fileBackground.add((Global.mainModule.getFile().form = new FileForm(Global.mainModule.getFile())).getContent());
projectTabs.setTabComponentAt(0,
new TabToolBar("Файл: " + Current.getFile().name, PassCode.CloseCurrentFile) {
new TabToolBar("Файл: " + Global.mainModule.getFile().name, PassCode.CloseCurrentFile) {
@Override
public void leftMouseAction() {
projectTabs.setSelectedIndex(0);
@@ -178,10 +178,10 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
@Override
public void GotoFile(String fileName, int line, boolean focus) {
if (focus) FocusFile();
if (Current.HasFile() && Current.getFile().name.equals(fileName))
Current.getFile().form.getEditor().gotoLine(line);
else if (Current.getProject().db.files.containsKey(fileName)) {
DBProjectFile targetFile = Current.getProject().db.files.get(fileName);
if (Global.mainModule.HasFile() && Global.mainModule.getFile().name.equals(fileName))
Global.mainModule.getFile().form.getEditor().gotoLine(line);
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);
}
@@ -229,17 +229,17 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
@Override
public void RefreshProjectTreeAndMessages() {
RefreshProjectFiles();
DBProjectFile badFile = Current.getProject().getFirstBadFile();
DBProjectFile badFile = Global.mainModule.getProject().getFirstBadFile();
if (badFile != null) {
Pass.passes.get(PassCode.OpenCurrentFile).Do(badFile);
UI.getMainWindow().FocusProject();
UI.getMainWindow().getProjectWindow().FocusFile();
}
//-
if (Current.HasFile()) {
Current.getFile().form.ShowMessages();
if (badFile != null && badFile.equals(Current.getFile()))
Current.getFile().form.ShowFirstError();
if (Global.mainModule.HasFile()) {
Global.mainModule.getFile().form.ShowMessages();
if (badFile != null && badFile.equals(Global.mainModule.getFile()))
Global.mainModule.getFile().form.ShowFirstError();
}
}
@Override
@@ -255,7 +255,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
@Override
public void ShowProjectView() {
UI_.Clear(projectViewPanel);
ProjectView view = Current.getProjectView();
ProjectView view = Global.mainModule.getProjectView();
menuBar.getProjectViewMenu().setToolTipText(view.getDescription());
menuBar.getProjectViewMenu().setIcon(Utils_.getIcon(view.getIcon()));
switch (view) {