no message
This commit is contained in:
@@ -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()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user