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

6
src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
View File

@@ -69,7 +69,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
//текст изменился, значит M ка более не актуальна.
file.father.dropLastModification();
}
Pass.passes.get(PassCode.Save).Reset();
Global.mainModule.getPass(PassCode.Save).Reset();
}
}
});
@@ -185,13 +185,13 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
}
@Override
protected void saveFont() {
Pass.passes.get(PassCode.UpdateSetting).Do(
Global.mainModule.getPass(PassCode.UpdateSetting).Do(
SettingName.EditorFontSize,
getFont().getSize());
}
@Override
protected void saveText() {
Pass.passes.get(PassCode.Save).Do();
Global.mainModule.getPass(PassCode.Save).Do();
}
@Override
protected StyledPopupMenu createMenu() {

10
src/_VisualDVM/ProjectData/Files/UI/FilesTree.java
View File

@@ -29,11 +29,11 @@ public class FilesTree extends StyledTree {
break;
case KeyEvent.VK_ADD: //num lock +
case KeyEvent.VK_EQUALS: //+
Pass.passes.get(PassCode.IncludeFile).Do();
Global.mainModule.getPass(PassCode.IncludeFile).Do();
break;
case KeyEvent.VK_SUBTRACT: //num lock -
case KeyEvent.VK_MINUS: //-
Pass.passes.get(PassCode.ExcludeFile).Do();
Global.mainModule.getPass(PassCode.ExcludeFile).Do();
break;
case KeyEvent.VK_F2:
forkFD(PassCode.RenameFile, PassCode.RenameDirectory);
@@ -46,14 +46,14 @@ public class FilesTree extends StyledTree {
}
);
new FileDrop(System.out, this, files -> {
Pass.passes.get(PassCode.ImportFiles).Do(files);
Global.mainModule.getPass(PassCode.ImportFiles).Do(files);
});
Global.mainModule.set(Current.File, null);
}
private static void forkFD(PassCode file_pass, PassCode folder_pass) {
DefaultMutableTreeNode node = Global.mainModule.getProjectNode();
if (node != null)
Pass.passes.get((node.getUserObject() instanceof DBProjectFile) ?
Global.mainModule.getPass((node.getUserObject() instanceof DBProjectFile) ?
file_pass : folder_pass).Do();
}
@Override
@@ -89,7 +89,7 @@ public class FilesTree extends StyledTree {
//очень важно. иначе по открытии файла дерево остается в фокусе.
//и не происходит прокрутки скролла к строке!!
UI.getMainWindow().getProjectWindow().FocusFileTabs();
Pass.passes.get(PassCode.OpenCurrentFile).Do(o);
Global.mainModule.getPass(PassCode.OpenCurrentFile).Do(o);
}
}
}

6
src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java
View File

@@ -22,11 +22,11 @@ public class VersionsTree extends DataTree {
public void keyPressed(KeyEvent e) {
switch (e.getKeyCode()) {
case KeyEvent.VK_DELETE:
Pass.passes.get(PassCode.DeleteVersion).Do();
Global.mainModule.getPass(PassCode.DeleteVersion).Do();
break;
case KeyEvent.VK_ENTER:
if (Global.mainModule.HasVersion())
Pass.passes.get(PassCode.OpenCurrentProject).Do(Global.mainModule.getVersion());
Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(Global.mainModule.getVersion());
break;
}
}
@@ -60,7 +60,7 @@ public class VersionsTree extends DataTree {
}
@Override
public void LeftMouseAction2() {
Pass.passes.get(PassCode.OpenCurrentProject).Do(Global.mainModule.getVersion());
Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(Global.mainModule.getVersion());
}
@Override
protected int getStartLine() {

2
src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
View File

@@ -79,6 +79,6 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
}
@Override
public void CheckAll(boolean flag) {
Pass.passes.get(PassCode.MassSelectArrays).Do(flag,new Vector(Global.mainModule.getProject().declaratedArrays.Data.values()));
Global.mainModule.getPass(PassCode.MassSelectArrays).Do(flag,new Vector(Global.mainModule.getProject().declaratedArrays.Data.values()));
}
}

2
src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
View File

@@ -363,7 +363,7 @@ public class ProjectArray extends DBObject {
}
@Override
public void select(boolean flag) {
Pass.passes.get(PassCode.MassSelectArrays).Do(flag, this);
Global.mainModule.getPass(PassCode.MassSelectArrays).Do(flag, this);
}
@Override
public boolean isSelected() {

8
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
View File

@@ -1,20 +1,20 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import _VisualDVM.Visual.Menus.GraphMenu;
import Common.Visual.Trees.StyledTree;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.GraphMenu;
import javax.swing.*;
public class DistributionMenu extends GraphMenu {
JMenuItem mChangeDistribution;
public DistributionMenu(StyledTree tree) {
super(tree, "области распараллеливания");
mChangeDistribution = Pass.passes.get(PassCode.SPF_ModifyArrayDistribution).createMenuItem();
mChangeDistribution = Global.mainModule.getPass(PassCode.SPF_ModifyArrayDistribution).createMenuItem();
add(mChangeDistribution);
}
@Override
public void CheckElementsVisibility() {
super.CheckElementsVisibility();
mChangeDistribution.setVisible(Pass.passes.get(PassCode.SPF_GetArrayDistribution).isDone());
mChangeDistribution.setVisible( Global.mainModule.getPass(PassCode.SPF_GetArrayDistribution).isDone());
}
}

6
src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.ProjectData.SapforData.Functions;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Visual_DVM_2021.Passes.PassCode;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
public class FuncCall extends FileObjectWithMessages {
public String funcName = ""; //не нужны дополнительные поля.имя функции это уже ключ.
public boolean canBeInlined = false;
@@ -29,7 +29,7 @@ public class FuncCall extends FileObjectWithMessages {
}
@Override
public void Select(boolean flag) {
if (Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
if ( Global.mainModule.getPass(PassCode.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
UI_.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));

4
src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java
View File

@@ -2,7 +2,7 @@ package _VisualDVM.ProjectData.SapforData.Functions;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Global;
import java.util.Vector;
public class FuncCallH extends FuncCall {
@@ -38,7 +38,7 @@ public class FuncCallH extends FuncCall {
}
@Override
public void Select(boolean flag) {
if (Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
if ( Global.mainModule.getPass(PassCode.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
UI_.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));

2
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
View File

@@ -24,7 +24,7 @@ public class FunctionsGraphMenu extends StyledPopupMenu {
Global.mainModule.set(Current.Function, Global.mainModule.getSelectionFunction());
UI.getMainWindow().getProjectWindow().getFunctionsWindow().ShowCurrentFunction();
if (SPF_GetGraphFunctionPositions.showByCurrentFunction) {
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();
}
}
}

2
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
View File

@@ -36,7 +36,7 @@ public class FunctionsGraphUI extends mxGraph {
public final static Timer ffTimer = new Timer(1000, new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();
}
});
//---