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

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

@@ -14,8 +14,8 @@ import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete;
import _VisualDVM.Visual.Menus.MainEditorMenu;
import _VisualDVM.ProjectData.SapforData.Loops.Loop;
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.SPFEditorInterface;
import javafx.util.Pair;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
@@ -69,7 +69,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
//текст изменился, значит M ка более не актуальна.
file.father.dropLastModification();
}
Pass_2021.passes.get(PassCode_2021.Save).Reset();
Pass.passes.get(PassCode.Save).Reset();
}
}
});
@@ -185,13 +185,13 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
}
@Override
protected void saveFont() {
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(
Pass.passes.get(PassCode.UpdateSetting).Do(
SettingName.EditorFontSize,
getFont().getSize());
}
@Override
protected void saveText() {
Pass_2021.passes.get(PassCode_2021.Save).Do();
Pass.passes.get(PassCode.Save).Do();
}
@Override
protected StyledPopupMenu createMenu() {

4
src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
@@ -23,7 +23,7 @@ public class FileGraphTree extends DataTree {
@Override
public void ShowCurrentObject() throws Exception {
Current.getFile().form.EventsOff();
Object o = CurrentAnchestor.get(getCurrent());
Object o = Current_.get(getCurrent());
Current.getFile().form.getEditor().gotoLine((o instanceof FileObjectWithMessages) ? (((FileObjectWithMessages) o).line) : 1);
Current.getFile().form.ShowMessages();
Current.getFile().form.EventsOn();

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

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import Common.Visual.DragDrop.FileDrop;
@@ -9,8 +9,8 @@ import _VisualDVM.Visual.UI;
import Common.Visual.Trees.StyledTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.ProjectData.Files.DBProjectFile;
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.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;
@@ -25,18 +25,18 @@ public class FilesTree extends StyledTree {
public void keyPressed(KeyEvent e) {
switch (e.getKeyCode()) {
case KeyEvent.VK_DELETE:
forkFD(PassCode_2021.DeleteFile, PassCode_2021.DeleteDirectory);
forkFD(PassCode.DeleteFile, PassCode.DeleteDirectory);
break;
case KeyEvent.VK_ADD: //num lock +
case KeyEvent.VK_EQUALS: //+
Pass_2021.passes.get(PassCode_2021.IncludeFile).Do();
Pass.passes.get(PassCode.IncludeFile).Do();
break;
case KeyEvent.VK_SUBTRACT: //num lock -
case KeyEvent.VK_MINUS: //-
Pass_2021.passes.get(PassCode_2021.ExcludeFile).Do();
Pass.passes.get(PassCode.ExcludeFile).Do();
break;
case KeyEvent.VK_F2:
forkFD(PassCode_2021.RenameFile, PassCode_2021.RenameDirectory);
forkFD(PassCode.RenameFile, PassCode.RenameDirectory);
break;
case KeyEvent.VK_ENTER:
LeftMouseAction2();
@@ -46,14 +46,14 @@ public class FilesTree extends StyledTree {
}
);
new FileDrop(System.out, this, files -> {
Pass_2021.passes.get(PassCode_2021.ImportFiles).Do(files);
Pass.passes.get(PassCode.ImportFiles).Do(files);
});
CurrentAnchestor.set(Current.File, null);
Current_.set(Current.File, null);
}
private static void forkFD(PassCode_2021 file_pass, PassCode_2021 folder_pass) {
private static void forkFD(PassCode file_pass, PassCode folder_pass) {
DefaultMutableTreeNode node = Current.getProjectNode();
if (node != null)
Pass_2021.passes.get((node.getUserObject() instanceof DBProjectFile) ?
Pass.passes.get((node.getUserObject() instanceof DBProjectFile) ?
file_pass : folder_pass).Do();
}
@Override
@@ -67,16 +67,16 @@ public class FilesTree extends StyledTree {
@Override
public void SelectionAction(TreePath e) {
DefaultMutableTreeNode node = (DefaultMutableTreeNode) e.getLastPathComponent();
CurrentAnchestor.set(Current.ProjectNode, node);
Current_.set(Current.ProjectNode, node);
Object o = node.getUserObject();
if (o instanceof File) {
CurrentAnchestor.set(Current.SelectedDirectory, o);
CurrentAnchestor.set(Current.SelectedFile, null);
Current_.set(Current.SelectedDirectory, o);
Current_.set(Current.SelectedFile, null);
UI.getMainWindow().getProjectWindow().ShowNoSelectedFile();
} else if (o instanceof DBProjectFile) {
CurrentAnchestor.set(Current.SelectedFile, o);
Current_.set(Current.SelectedFile, o);
File file = ((DBProjectFile) o).file;
CurrentAnchestor.set(Current.SelectedDirectory, file.getParentFile());
Current_.set(Current.SelectedDirectory, file.getParentFile());
UI.getMainWindow().getProjectWindow().ShowSelectedFile();
}
UI.getMainWindow().getProjectWindow().ShowSelectedDirectory();
@@ -89,7 +89,7 @@ public class FilesTree extends StyledTree {
//очень важно. иначе по открытии файла дерево остается в фокусе.
//и не происходит прокрутки скролла к строке!!
UI.getMainWindow().getProjectWindow().FocusFileTabs();
Pass_2021.passes.get(PassCode_2021.OpenCurrentFile).Do(o);
Pass.passes.get(PassCode.OpenCurrentFile).Do(o);
}
}
}

4
src/_VisualDVM/ProjectData/Messages/Message.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Messages;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Mode;
import Common.Utils.CommonUtils;
import _VisualDVM.Constants;
@@ -450,7 +450,7 @@ public class Message extends FileObject {
@Override
public boolean isVisible() {
if (Current.HasFile() && Current.getFile().name.equals(file)) {
Object o = CurrentAnchestor.get(Current.FileGraphElement);
Object o = Current_.get(Current.FileGraphElement);
return !(o instanceof FileObjectWithMessages) || ((FileObjectWithMessages) o).HasMessage(this);
} else return false;
}

4
src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java
View File

@@ -2,7 +2,7 @@ package _VisualDVM.ProjectData.Messages.Recommendations;
import Common.Database.Objects.iDBObject;
import Common.Utils.CommonUtils;
import _VisualDVM.GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import com.sun.org.glassfish.gmbal.Description;
public class MessageRecommendation extends iDBObject {
//рекомендация может касаться, либо настройки либо прохода. так же может быть просто текстовой.
@@ -16,7 +16,7 @@ public class MessageRecommendation extends iDBObject {
public String text = ""; //текст
public MessageRecommendation() {
}
public MessageRecommendation(PassCode_2021 passCode_in) {
public MessageRecommendation(PassCode passCode_in) {
type = RecommendationType.Transformation;
argName = passCode_in.toString();
text = "Выполните преобразование " + CommonUtils.Quotes(passCode_in.getDescription());

14
src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
View File

@@ -4,7 +4,7 @@ import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableRenderers;
import _VisualDVM.GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
//group=1 - настройка
//group=2 - преобразование
@@ -55,17 +55,17 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
break;
*/
case 1015:
result = new MessageRecommendation(PassCode_2021.SPF_RemoveUnusedFunctions);
result = new MessageRecommendation(PassCode.SPF_RemoveUnusedFunctions);
break;
case 1018:
result = new MessageRecommendation(PassCode_2021.SPF_LoopEndDoConverterPass);
result = new MessageRecommendation(PassCode.SPF_LoopEndDoConverterPass);
break;
case 1020:
result = new MessageRecommendation(SettingName.KEEP_DVM_DIRECTIVES, "1");
break;
case 1027:
case 1060:
result = new MessageRecommendation(PassCode_2021.SPF_CorrectCodeStylePass);
result = new MessageRecommendation(PassCode.SPF_CorrectCodeStylePass);
break;
case 1041:
case 3012:
@@ -74,13 +74,13 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
case 3015:
case 3017:
case 3018:
result = new MessageRecommendation(PassCode_2021.SPF_ResolveParallelRegionConflicts);
result = new MessageRecommendation(PassCode.SPF_ResolveParallelRegionConflicts);
break;
case 1061:
result = new MessageRecommendation(PassCode_2021.SPF_InsertIncludesPass);
result = new MessageRecommendation(PassCode.SPF_InsertIncludesPass);
break;
case 3020:
result = new MessageRecommendation(PassCode_2021.SPF_DuplicateFunctionChains);
result = new MessageRecommendation(PassCode.SPF_DuplicateFunctionChains);
break;
}
MessageRecommendation finalResult = result;

4
src/_VisualDVM/ProjectData/Project/ChangeSettingPass.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.Project;
import _VisualDVM.GlobalData.Settings.DBSetting;
import Visual_DVM_2021.Passes.Pass_2021;
public class ChangeSettingPass extends Pass_2021<DBSetting> {
import Visual_DVM_2021.Passes.Pass;
public class ChangeSettingPass extends Pass<DBSetting> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = (DBSetting) args[0];

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

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Project.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.GraphMenu;
@@ -7,8 +7,8 @@ import _VisualDVM.Visual.Menus.VersionsMenu;
import Common.Visual.Selectable;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
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.tree.TreePath;
import java.awt.event.KeyAdapter;
@@ -22,11 +22,11 @@ public class VersionsTree extends DataTree {
public void keyPressed(KeyEvent e) {
switch (e.getKeyCode()) {
case KeyEvent.VK_DELETE:
Pass_2021.passes.get(PassCode_2021.DeleteVersion).Do();
Pass.passes.get(PassCode.DeleteVersion).Do();
break;
case KeyEvent.VK_ENTER:
if (Current.HasVersion())
Pass_2021.passes.get(PassCode_2021.OpenCurrentProject).Do(Current.getVersion());
Pass.passes.get(PassCode.OpenCurrentProject).Do(Current.getVersion());
break;
}
}
@@ -51,7 +51,7 @@ public class VersionsTree extends DataTree {
public void LeftMouseAction1() {
if (Global.versions_multiselection) {
// только если есть режим выбора версий.
Object element = CurrentAnchestor.get(getCurrent());
Object element = Current_.get(getCurrent());
if ((element instanceof Selectable)) {
((Selectable) element).SwitchSelection();
updateUI();
@@ -60,7 +60,7 @@ public class VersionsTree extends DataTree {
}
@Override
public void LeftMouseAction2() {
Pass_2021.passes.get(PassCode_2021.OpenCurrentProject).Do(Current.getVersion());
Pass.passes.get(PassCode.OpenCurrentProject).Do(Current.getVersion());
}
@Override
protected int getStartLine() {

26
src/_VisualDVM/ProjectData/Project/db_project_info.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.Project;
import Common.CommonConstants;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Constants;
@@ -37,7 +37,7 @@ import _VisualDVM.ProjectData.SapforData.Regions.RegionsSet;
import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
import _VisualDVM.ProjectData.SapforData.Variants.VariantsSet;
import _VisualDVM.TestingSystem.Common.Test.ProjectFiles_json;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.PassException;
import com.mxgraph.swing.mxGraphComponent;
import com.sun.org.glassfish.gmbal.Description;
@@ -239,7 +239,7 @@ public class db_project_info extends DBObject {
return new File(Paths.get(project_home.toString(), Constants.data,
Global.properties.ProjectDBName).toString());
}
public static String recommendAnalysis(PassCode_2021 code_in) {
public static String recommendAnalysis(PassCode code_in) {
return Constants.unknown_metric + " примените анализатор \"" + code_in.getDescription() + "\"";
}
/*
@@ -435,8 +435,8 @@ public class db_project_info extends DBObject {
db.ResetAI(MessageWarning.class);
db.ResetAI(MessageRecommendation.class);
//-
CurrentAnchestor.set(Current.Function, null);
CurrentAnchestor.set(Current.SelectedFunction, null);
Current_.set(Current.Function, null);
Current_.set(Current.SelectedFunction, null);
}
public void CleanVersions() throws Exception {
node.removeAllChildren();
@@ -518,25 +518,25 @@ public class db_project_info extends DBObject {
}
}
public String LinesCount() {
return numLines == ParallelVariant.statNaN ? recommendAnalysis(PassCode_2021.SPF_GetFileLineInfo) : String.valueOf(numLines);
return numLines == ParallelVariant.statNaN ? recommendAnalysis(PassCode.SPF_GetFileLineInfo) : String.valueOf(numLines);
}
public String SPFCount() {
return numSPF == ParallelVariant.statNaN ? recommendAnalysis(PassCode_2021.SPF_GetFileLineInfo) : String.valueOf(numSPF);
return numSPF == ParallelVariant.statNaN ? recommendAnalysis(PassCode.SPF_GetFileLineInfo) : String.valueOf(numSPF);
}
public String DVMCount() {
return numDVM == ParallelVariant.statNaN ? recommendAnalysis(PassCode_2021.SPF_GetFileLineInfo) : String.valueOf(numDVM);
return numDVM == ParallelVariant.statNaN ? recommendAnalysis(PassCode.SPF_GetFileLineInfo) : String.valueOf(numDVM);
}
public String ArraysCount() {
return numArrays == ParallelVariant.statNaN ? recommendAnalysis(PassCode_2021.SPF_GetAllDeclaratedArrays) : String.valueOf(numArrays);
return numArrays == ParallelVariant.statNaN ? recommendAnalysis(PassCode.SPF_GetAllDeclaratedArrays) : String.valueOf(numArrays);
}
public String LoopsCount() {
return numLoops == ParallelVariant.statNaN ? recommendAnalysis(PassCode_2021.SPF_GetGraphLoops) : String.valueOf(numLoops);
return numLoops == ParallelVariant.statNaN ? recommendAnalysis(PassCode.SPF_GetGraphLoops) : String.valueOf(numLoops);
}
public String FunctionsCount() {
return numFunctions == CommonConstants.Nan ? recommendAnalysis(PassCode_2021.SPF_GetGraphFunctions) : String.valueOf(numFunctions);
return numFunctions == CommonConstants.Nan ? recommendAnalysis(PassCode.SPF_GetGraphFunctions) : String.valueOf(numFunctions);
}
public String AddictedCount() {
return numAddicted == CommonConstants.Nan ? recommendAnalysis(PassCode_2021.SPF_GetIncludeDependencies) : String.valueOf(numAddicted);
return numAddicted == CommonConstants.Nan ? recommendAnalysis(PassCode.SPF_GetIncludeDependencies) : String.valueOf(numAddicted);
}
public boolean UpdateLinesCount() {
try {
@@ -1069,7 +1069,7 @@ public class db_project_info extends DBObject {
target.Close();
}
public void undoLastTransformation() throws Exception {
CurrentAnchestor.set(Current.Version, null);
Current_.set(Current.Version, null);
//---
UI.getVersionsWindow().getVersionsForm().getTree().RemoveNode(last_version.node);
Utils.forceDeleteWithCheck(last_version.Home);

4
src/_VisualDVM/ProjectData/ProjectDatabase.java
View File

@@ -12,7 +12,7 @@ import _VisualDVM.ProjectData.PredictorStatistic.PredictorStatisticsDBTable;
import _VisualDVM.ProjectData.Project.ProjectInfoDBTable;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinatesDBTable;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;
@@ -86,7 +86,7 @@ public class ProjectDatabase extends SQLiteDatabase {
Delete(f);
}
@Override
public PassCode_2021 getSynchronizePassCode() {
public PassCode getSynchronizePassCode() {
return null;
}
//особый проход. нужен при первичной загрузке проекта.

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

@@ -5,8 +5,8 @@ import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Settings.SettingName;
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 java.util.Vector;
@@ -78,6 +78,6 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
}
@Override
public void CheckAll(boolean flag) {
Pass_2021.passes.get(PassCode_2021.MassSelectArrays).Do(flag,new Vector(Current.getProject().declaratedArrays.Data.values()));
Pass.passes.get(PassCode.MassSelectArrays).Do(flag,new Vector(Current.getProject().declaratedArrays.Data.values()));
}
}

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

@@ -11,8 +11,8 @@ import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimensionState
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateLink;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import _VisualDVM.ProjectData.SapforData.Regions.UI.ArrayAlignmentBar;
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 javax.swing.*;
@@ -362,7 +362,7 @@ public class ProjectArray extends DBObject {
}
@Override
public void select(boolean flag) {
Pass_2021.passes.get(PassCode_2021.MassSelectArrays).Do(flag, this);
Pass.passes.get(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_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 DistributionMenu extends GraphMenu {
JMenuItem mChangeDistribution;
public DistributionMenu(StyledTree tree) {
super(tree, "области распараллеливания");
mChangeDistribution = Pass_2021.passes.get(PassCode_2021.SPF_ModifyArrayDistribution).createMenuItem();
mChangeDistribution = Pass.passes.get(PassCode.SPF_ModifyArrayDistribution).createMenuItem();
add(mChangeDistribution);
}
@Override
public void CheckElementsVisibility() {
super.CheckElementsVisibility();
mChangeDistribution.setVisible(Pass_2021.passes.get(PassCode_2021.SPF_GetArrayDistribution).isDone());
mChangeDistribution.setVisible(Pass.passes.get(PassCode.SPF_GetArrayDistribution).isDone());
}
}

6
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Visual.Menus.GraphMenu;
import Common.Visual.Trees.StyledTree;
@@ -16,7 +16,7 @@ public class RulesTree extends StyledTree {
setRootVisible(false);
expandRow(0);
ExpandAll();
CurrentAnchestor.set(Current.ParallelRegion, null);
Current_.set(Current.ParallelRegion, null);
}
@Override
protected GraphMenu createMenu() {
@@ -39,6 +39,6 @@ public class RulesTree extends StyledTree {
region = (ParallelRegion) o;
}
}
CurrentAnchestor.set(Current.ParallelRegion, region);
Current_.set(Current.ParallelRegion, region);
}
}

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

@@ -3,8 +3,8 @@ import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
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;
public class FuncCall extends FileObjectWithMessages {
public String funcName = ""; //не нужны дополнительные поля.имя функции это уже ключ.
public boolean canBeInlined = false;
@@ -29,10 +29,10 @@ public class FuncCall extends FileObjectWithMessages {
}
@Override
public void Select(boolean flag) {
if (Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctions).isDone()) {
if (Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
CommonUI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
CommonUI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
}
}
}

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

@@ -1,8 +1,8 @@
package _VisualDVM.ProjectData.SapforData.Functions;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
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 java.util.Vector;
public class FuncCallH extends FuncCall {
@@ -38,10 +38,10 @@ public class FuncCallH extends FuncCall {
}
@Override
public void Select(boolean flag) {
if (Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctions).isDone()) {
if (Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
CommonUI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
CommonUI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
}
}
}

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

@@ -1,13 +1,13 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import Common.Visual.Menus.VisualiserMenuItem;
import Common.Visual.Menus.StyledPopupMenu;
import _VisualDVM.Visual.UI;
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 javax.swing.*;
import java.awt.event.ActionEvent;
@@ -20,10 +20,10 @@ public class FunctionsGraphMenu extends StyledPopupMenu {
@Override
public void actionPerformed(ActionEvent e) {
if (Current.HasSelectedFunction()) {
CurrentAnchestor.set(Current.Function, Current.getSelectionFunction());
Current_.set(Current.Function, Current.getSelectionFunction());
UI.getMainWindow().getProjectWindow().getFunctionsWindow().ShowCurrentFunction();
if (SPF_GetGraphFunctionPositions.showByCurrentFunction) {
Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctionPositions).Do();
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
}
}
}

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

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
@@ -7,8 +7,8 @@ import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinates;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
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 com.mxgraph.model.mxCell;
import com.mxgraph.model.mxGeometry;
import com.mxgraph.swing.mxGraphComponent;
@@ -35,7 +35,7 @@ public class FunctionsGraphUI extends mxGraph {
public final static Timer ffTimer = new Timer(1000, new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctionPositions).Do();
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
}
});
//---
@@ -141,7 +141,7 @@ public class FunctionsGraphUI extends mxGraph {
funcInfo = Current.getProject().allFunctions.get(name);
String vertexType = funcInfo.type.toString();
if (SPF_GetGraphFunctionPositions.showByCurrentFunction) {
FuncInfo current_fi = (FuncInfo) CurrentAnchestor.get(Current.Function);
FuncInfo current_fi = (FuncInfo) Current_.get(Current.Function);
if ((current_fi != null) && (funcInfo.funcName.equals(current_fi.funcName))) {
vertexType = "current";
}
@@ -234,7 +234,7 @@ public class FunctionsGraphUI extends mxGraph {
FuncInfo fi = Current.getProject().allFunctions.get(func_name);
switch (e.getClickCount()) {
case 1:
CurrentAnchestor.set(Current.SelectedFunction, fi);
Current_.set(Current.SelectedFunction, fi);
break;
case 2:
switch (fi.type) {

4
src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Visual.Menus.GraphMenu;
import Common.Visual.Trees.SelectableTree;
@@ -19,7 +19,7 @@ public class InlineTree extends SelectableTree {
}
@Override
public void ShowCurrentObject() {
Object o = CurrentAnchestor.get(getCurrent());
Object o = Current_.get(getCurrent());
if (o instanceof FileObject) {
((FileObject) o).Show(false);
}

4
src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Visual.Menus.GraphMenu;
import Common.Visual.Trees.SelectableTree;
@@ -23,7 +23,7 @@ public class InlineTree2 extends SelectableTree {
}
@Override
public void ShowCurrentObject() {
Object o = CurrentAnchestor.get(getCurrent());
Object o = Current_.get(getCurrent());
if (o instanceof FileObject) {
((FileObject) o).Show(false);
}