no message

This commit is contained in:
2024-10-14 15:19:13 +03:00
parent 8eef367bd4
commit 5e09fb44ea
634 changed files with 3751 additions and 3263 deletions

View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.SapforData.Arrays;
import _VisualDVM.Current;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
@@ -76,6 +76,6 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
}
@Override
public void CheckAll(boolean flag) {
Global.mainModule.getPass(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()));
}
}

View File

@@ -1,8 +1,9 @@
package _VisualDVM.ProjectData.SapforData.Arrays;
import Common.Utils.Utils_;
import Common.Database.Objects.DBObject;
import Common.Utils.Index;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.DBArray.DBArray;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.Arrays.Distribution.Dimension;
@@ -11,7 +12,6 @@ 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 _VisualDVM.Passes.PassCode;
import javafx.util.Pair;
import javax.swing.*;

View File

@@ -1,5 +1,4 @@
package _VisualDVM.ProjectData.SapforData.Arrays.Templates;
import _VisualDVM.Current;
import _VisualDVM.Global;
public enum TemplateDimensionState {
multiplied, //0

View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Visual.UI_;
import Common.Visual.Tables.RendererCell;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.RendererCell;
import Common.Visual.UI_;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import javax.swing.*;

View File

@@ -1,9 +1,9 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Visual.UI_;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.Visual.UI;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.UI_;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import _VisualDVM.Visual.UI;
import javax.swing.*;
public class DimensionStateChanger extends DBObjectEditor<TemplateDimension> {

View File

@@ -1,13 +1,12 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.ControlForm;
import Common.Visual.Tables.Grid.GridAnchestor;
import Common.Visual.Tables.StyledTable;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import _VisualDVM.Visual.UI;
import java.awt.*;
import java.util.Vector;

View File

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

View File

@@ -1,5 +1,4 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.UI.FileGraphTree;
public class FileArraysTree extends FileGraphTree {

View File

@@ -1,11 +1,10 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.GraphMenu;
import Common.Visual.Trees.StyledTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import _VisualDVM.Visual.Menus.GraphMenu;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;

View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Trees.StyledTreeCellRenderer;
import Common.Visual.UI_;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import javax.swing.*;

View File

@@ -1,10 +1,9 @@
package _VisualDVM.ProjectData.SapforData;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
import com.sun.org.glassfish.gmbal.Description;
//объект принадлежащий файлу и относящийся к его строке.
public abstract class FileObject extends iDBObject {

View File

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

View File

@@ -1,8 +1,8 @@
package _VisualDVM.ProjectData.SapforData.Functions;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
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 ( Global.mainModule.getPass(PassCode.SPF_GetGraphFunctions).isDone()) {
if (Global.mainModule.getPass(PassCode.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
UI_.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));

View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Functions;
import Common.Utils.Utils_;
import Common.Utils.Index;
import Common.Utils.Utils_;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
import com.mxgraph.model.mxCell;

View File

@@ -1,5 +1,4 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.UI.FileGraphTree;
public class FileFunctionsTree extends FileGraphTree {

View File

@@ -1,7 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.ControlForm;
import Common.Visual.UI_;
import _VisualDVM.Global;
import com.mxgraph.swing.mxGraphComponent;

View File

@@ -1,12 +1,12 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Visual.Menus.VisualiserMenuItem;
import Common.Visual.Menus.StyledPopupMenu;
import Common.Visual.Menus.VisualiserMenuItem;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Passes.All.SPF_GetGraphFunctionPositions;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.event.ActionEvent;

View File

@@ -3,11 +3,11 @@ import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.All.SPF_GetGraphFunctionPositions;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinates;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
import _VisualDVM.Passes.All.SPF_GetGraphFunctionPositions;
import _VisualDVM.Passes.PassCode;
import com.mxgraph.model.mxCell;
import com.mxgraph.model.mxGeometry;
import com.mxgraph.swing.mxGraphComponent;
@@ -221,7 +221,6 @@ public class FunctionsGraphUI extends mxGraph {
}
});
graphComponent.getGraphControl().setComponentPopupMenu(new FunctionsGraphMenu());
//обработка клика мышом.
graphComponent.getGraphControl().addMouseListener(new MouseAdapter() {
public void mouseReleased(MouseEvent e) {

View File

@@ -64,5 +64,4 @@ public class GraphInfo {
// return new FunctionsGraphUIGreed(this).Draw();
return new FunctionsGraphUI(this).Draw();
}
}

View File

@@ -1,9 +1,8 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.SelectionTreeMenu;
import Common.Visual.Trees.SelectableTree;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.Visual.Menus.SelectionTreeMenu;
public class InlineMenu extends SelectionTreeMenu {
public InlineMenu(SelectableTree tree_in) {
super(tree_in);

View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI;
import _VisualDVM.Visual.Menus.SelectionTreeMenu;
import Common.Visual.Trees.SelectableTree;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCallH;
import _VisualDVM.Visual.Menus.SelectionTreeMenu;
import javax.swing.tree.DefaultMutableTreeNode;
public class InlineMenu2 extends SelectionTreeMenu {

View File

@@ -1,11 +1,10 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.GraphMenu;
import Common.Visual.Trees.SelectableTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.FileObject;
import _VisualDVM.Visual.Menus.GraphMenu;
public class InlineTree extends SelectableTree {
public InlineTree() {
super(Global.mainModule.getProject().inline_root);

View File

@@ -1,11 +1,10 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.GraphMenu;
import Common.Visual.Trees.SelectableTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.FileObject;
import _VisualDVM.Visual.Menus.GraphMenu;
public class InlineTree2 extends SelectableTree {
public InlineTree2() {
super(Global.mainModule.getProject().inline_root2);

View File

@@ -1,9 +1,8 @@
package _VisualDVM.ProjectData.SapforData.Includes.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.SelectionTreeMenu;
import Common.Visual.Trees.SelectableTree;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
import _VisualDVM.Visual.Menus.SelectionTreeMenu;
public class IncludesMenu extends SelectionTreeMenu {
public IncludesMenu(SelectableTree tree_in) {
super(tree_in);

View File

@@ -1,9 +1,9 @@
package _VisualDVM.ProjectData.SapforData.Includes.UI;
import Common.Visual.Trees.SelectableTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.GraphMenu;
import Common.Visual.Trees.SelectableTree;
import Common.Visual.Trees.TreeRenderers;
public class IncludesTree extends SelectableTree {
public IncludesTree() {
super(Global.mainModule.getProject().includes_root);

View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Loops;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Utils.Index;
import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Messages.Message;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;

View File

@@ -1,5 +1,4 @@
package _VisualDVM.ProjectData.SapforData.Loops.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.UI.FileGraphTree;
public class FileLoopsTree extends FileGraphTree {

View File

@@ -1,8 +1,7 @@
package _VisualDVM.ProjectData.SapforData.Regions;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
import Common.Utils.Index;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.Arrays.Distribution.AlignRule;
@@ -129,7 +128,7 @@ public class ParallelRegion extends DBObject {
}
}
public void UpdateArraysCount() {
arrays_count=0;
arrays_count = 0;
for (String FKey : lines.keySet()) {
for (Pair<Integer, Integer> L : lines.get(FKey)) {
DBProjectFile f = Global.mainModule.getProject().db.files.Data.get(FKey);

View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.SapforData.Regions;
import _VisualDVM.Current;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import java.math.BigInteger;

View File

@@ -1,5 +1,4 @@
package _VisualDVM.ProjectData.SapforData.Regions.UI;
import _VisualDVM.Current;
import Common.Visual.Tables.StyledCellLabel;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;

View File

@@ -1,10 +1,10 @@
package _VisualDVM.ProjectData.SapforData.Variants;
import Common.Database.Objects.DBObject;
import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.PredictorStatistic.PredictorStatistics_2021;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import java.io.File;
@@ -21,6 +21,7 @@ public class ParallelVariant extends DBObject {
public PredictorStatistics_2021 stats = null;
public Vector<String> templates_description = new Vector<>();
public LinkedHashMap<Pair<BigInteger, BigInteger>, Long> key = new LinkedHashMap<>();
public File project = null;
public ParallelVariant(db_project_info father_in, Vector<BigInteger> vector) {
father = father_in;
UniqKey = "";
@@ -71,7 +72,6 @@ public class ParallelVariant extends DBObject {
public String getDescription() {
return String.join(";", templates_description);
}
@Override
public Object getPK() {
return UniqKey;
@@ -81,9 +81,8 @@ public class ParallelVariant extends DBObject {
super.Select(flag);
UI.getVersionsWindow().getVariantsWindow().ShowCheckedVariantsCount();
}
public File project = null;
public File restoreProject() {
project=null;
project = null;
if (stats != null) {
if (stats.last_version.isEmpty()) return null;
project = Paths.get(father.Home.getAbsolutePath(), stats.last_version).toFile();

View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.SapforData.Variants;
import _VisualDVM.Current;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import static Common.Visual.Tables.TableRenderers.*;
public class VariantsSet extends DataSet<String, ParallelVariant> {
@@ -28,7 +28,6 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
columns.get(columns.size() - 3).setRenderer(RendererVariantRank);
columns.get(columns.size() - 2).setRenderer(RendererDate);
}
};
}
@Override