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-14 15:19:13 +03:00
parent 8eef367bd4
commit 5e09fb44ea
634 changed files with 3751 additions and 3263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.DBArray;
import _VisualDVM.Current;
import Common.Database.Tables.DBTable;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
public class ArraysDBTable extends DBTable<String, DBArray> {
public ArraysDBTable() {
super(String.class, DBArray.class);

7
src/_VisualDVM/ProjectData/Files/DBProjectFile.java
View File

@@ -1,9 +1,7 @@
package _VisualDVM.ProjectData.Files;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.GCOV.GCOV_info;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ProjectData.Messages.Errors.MessageError;
@@ -16,6 +14,7 @@ import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.ProjectData.SapforData.Loops.Loop;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Windows.FileForm;
import com.sun.org.glassfish.gmbal.Description;
import javafx.util.Pair;
@@ -396,7 +395,6 @@ public class DBProjectFile extends ProjectFile {
public String getQObjectName() {
return Utils_.DQuotes(getUnixName() + ".o");
}
@Override
public String toString() {
return name;
@@ -431,7 +429,7 @@ public class DBProjectFile extends ProjectFile {
break;
}
languageName = parent.languageName;
if (sapforStyle) style =Global.mainModule.getSapfor().getStyle();
if (sapforStyle) style = Global.mainModule.getSapfor().getStyle();
else style = parent.style;
}
//------------------
@@ -474,5 +472,4 @@ public class DBProjectFile extends ProjectFile {
return res;
}
//---
}

2
src/_VisualDVM/ProjectData/Files/ProjectFile.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.Files;
import Common.Database.Objects.DBObject;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import Common.Database.Objects.DBObject;
import _VisualDVM.ProjectData.LanguageName;
import javax.swing.*;

2
src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
import Common.Utils.Utils_;
import _VisualDVM.Visual.Editor.CaretInfo;
import _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
import _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete;
import _VisualDVM.Visual.Editor.CaretInfo;
import org.fife.ui.autocomplete.BasicCompletion;
//определяет, должна ли отображаться в меню автозаполнения директива данного типа.
public class BaseDirective extends BasicCompletion {

3
src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/DirectiveName.java
View File

@@ -42,8 +42,7 @@ public enum DirectiveName {
UNROLL,
PROCESS_PRIVATE,
COVER,
MERGE
;
MERGE;
public String getDescription() {
switch (this) {
case SPF:

4
src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java
View File

@@ -10,8 +10,8 @@ public class SpecDirective extends BaseDirective {
super(provider_in, name_in);
}
public String get_word() {
boolean noBrackets = name.equals(DirectiveName.NOINLINE)||
name.equals(DirectiveName.UNROLL)|| name.equals(DirectiveName.MERGE);
boolean noBrackets = name.equals(DirectiveName.NOINLINE) ||
name.equals(DirectiveName.UNROLL) || name.equals(DirectiveName.MERGE);
return name.getText() + (noBrackets ? "" : "()");
}
@Override

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

@@ -1,19 +1,19 @@
package _VisualDVM.ProjectData.Files.UI.Editor;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Visual.Editor.BaseEditor;
import _VisualDVM.Visual.Editor.CaretInfo;
import Common.Visual.Menus.StyledPopupMenu;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
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 _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Editor.BaseEditor;
import _VisualDVM.Visual.Editor.CaretInfo;
import _VisualDVM.Visual.Interface.SPFEditorInterface;
import _VisualDVM.Visual.Menus.MainEditorMenu;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;

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

@@ -1,8 +1,7 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.Current_;
import _VisualDVM.Current;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.FileObject;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
@@ -11,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode;
public class FileGraphTree extends DataTree {
public FileGraphTree(DefaultMutableTreeNode root) {
super(root);
// ExpandAll();
// ExpandAll();
}
@Override
public TreeRenderers getRenderer() {

2
src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import _VisualDVM.Visual.UI;
import javax.swing.*;

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

@@ -1,14 +1,14 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.Visual.DragDrop.FileDrop;
import Common.Visual.Trees.StyledTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import Common.Visual.DragDrop.FileDrop;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.Menus.GraphMenu;
import _VisualDVM.Visual.Menus.ProjectFilesMenu;
import _VisualDVM.Visual.UI;
import Common.Visual.Trees.StyledTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Passes.PassCode;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;

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

@@ -1,8 +1,8 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.Visual.UI_;
import _VisualDVM.Global;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Trees.StyledTreeCellRenderer;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;

2
src/_VisualDVM/ProjectData/LanguageName.java
View File

@@ -86,7 +86,7 @@ public enum LanguageName {
}
return new Vector<>(Arrays.asList(res));
}
public String PrintExtensions(){
public String PrintExtensions() {
return String.join(",", getExtensions());
}
}

1
src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java
View File

@@ -21,5 +21,4 @@ public class ErrorsDBTable extends MessagesDBTable<MessageError> {
public Object getColumnFilterValue(int columnIndex) {
return MessageError.filterValue;
}
}

4
src/_VisualDVM/ProjectData/Messages/Errors/MessageError.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.ProjectData.Messages.Errors;
import _VisualDVM.ProjectData.Messages.Message;
public class MessageError extends Message {
public static String filterValue = "";
public MessageError(String file_in, int line_in, String value_in, int group_in) throws Exception {
super(file_in,
line_in,
@@ -9,9 +10,8 @@ public class MessageError extends Message {
}
public MessageError() {
}
public static String filterValue = "";
@Override
public boolean isVisible() {
return super.isVisible()&&value.contains(filterValue);
return super.isVisible() && value.contains(filterValue);
}
}

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

@@ -1,15 +1,13 @@
package _VisualDVM.ProjectData.Messages;
import Common.Current_;
import Common.Mode;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.ProjectData.SapforData.FileObject;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
import Common.Passes.PassException;
import _VisualDVM.Global;
import java.util.HashMap;
import java.util.Map;
@@ -273,7 +271,7 @@ public class Message extends FileObject {
codedMessages.put("R191", "Приватная переменная '%s' была удалена");
codedMessages.put("R201", "Приватная переменная '%s' была частично удалена");
//2019
codedMessages.put("R192", "Удаление приватной переменной '%s' было выполнено в предположении, что выражения '%s' и '%s' различны");
codedMessages.put("R192", "Удаление приватной переменной '%s' было выполнено в предположении, что выражения '%s' и '%s' различны");
//2020
codedMessages.put("R193", "");
codedMessages.put("R194", "Нельзя удалить приватную переменную '%s' - не удалось найти достигающее определение для оператора");
@@ -450,7 +448,7 @@ public class Message extends FileObject {
@Override
public boolean isVisible() {
if (Global.mainModule.HasFile() && Global.mainModule.getFile().name.equals(file)) {
Object o =Global.mainModule.get(Current.FileGraphElement);
Object o = Global.mainModule.get(Current.FileGraphElement);
return !(o instanceof FileObjectWithMessages) || ((FileObjectWithMessages) o).HasMessage(this);
} else return false;
}

6
src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.ProjectData.Messages;
import _VisualDVM.Current;
import Common.Database.Tables.DataSet;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
@@ -51,9 +50,8 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
sortKeys.add(new RowSorter.SortKey(6, SortOrder.DESCENDING));
sortKeys.add(new RowSorter.SortKey(7, SortOrder.DESCENDING));
*/
// sorter.setSortKeys(sortKeys);
// sorter.sort();
// sorter.setSortKeys(sortKeys);
// sorter.sort();
}
};
}

4
src/_VisualDVM/ProjectData/Messages/Notes/MessageNote.java
View File

@@ -1,14 +1,14 @@
package _VisualDVM.ProjectData.Messages.Notes;
import _VisualDVM.ProjectData.Messages.Message;
public class MessageNote extends Message {
public static String filterValue = "";
public MessageNote(String file_in, int line_in, String value_in, int group_in) throws Exception {
super(file_in, line_in, value_in, group_in);
}
public MessageNote() {
}
public static String filterValue = "";
@Override
public boolean isVisible() {
return super.isVisible()&&value.contains(filterValue);
return super.isVisible() && value.contains(filterValue);
}
}

1
src/_VisualDVM/ProjectData/Messages/Notes/NotesDBTable.java
View File

@@ -21,5 +21,4 @@ public class NotesDBTable extends MessagesDBTable<MessageNote> {
public Object getColumnFilterValue(int columnIndex) {
return MessageNote.filterValue;
}
}

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

@@ -1,8 +1,8 @@
package _VisualDVM.ProjectData.Messages.Recommendations;
import _VisualDVM.Current;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableRenderers;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
@@ -14,16 +14,14 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this){
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(1).setMinWidth(700);
columns.get(1).setRenderer(TableRenderers.RendererWrapText);
}
};
}
@Override
public String[] getUIColumnNames() {

7
src/_VisualDVM/ProjectData/Messages/Warnings/MessageWarning.java
View File

@@ -1,17 +1,14 @@
package _VisualDVM.ProjectData.Messages.Warnings;
import _VisualDVM.ProjectData.Messages.Message;
public class MessageWarning extends Message {
public static String filterValue = "";
public MessageWarning(String file_in, int line_in, String value_in, int group_in) throws Exception {
super(file_in, line_in, value_in, group_in);
}
public MessageWarning() {
}
public static String filterValue = "";
@Override
public boolean isVisible() {
return super.isVisible()&&value.contains(filterValue);
return super.isVisible() && value.contains(filterValue);
}
}

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

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.Project;
import _VisualDVM.GlobalData.Settings.DBSetting;
import Common.Passes.Pass;
import _VisualDVM.GlobalData.Settings.DBSetting;
public class ChangeSettingPass extends Pass<DBSetting> {
@Override
protected boolean canStart(Object... args) throws Exception {

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

@@ -1,12 +1,12 @@
package _VisualDVM.ProjectData.Project.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.GraphMenu;
import _VisualDVM.Visual.Menus.VersionsMenu;
import Common.Visual.Selectable;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.GraphMenu;
import _VisualDVM.Visual.Menus.VersionsMenu;
import javax.swing.tree.TreePath;
import java.awt.event.KeyAdapter;

7
src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java
View File

@@ -1,10 +1,9 @@
package _VisualDVM.ProjectData.Project.UI;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import Common.Visual.Selectable;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Selectable;
import Common.Visual.Trees.StyledTreeCellRenderer;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Project.db_project_info;
import javax.swing.*;

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

@@ -1,17 +1,17 @@
package _VisualDVM.ProjectData.Project;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Passes.PassException;
import Common.Utils.Index;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Common.Utils.Index;
import Common.Utils.TextLog;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.DBLastProject.DBLastProject;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.DBArray.DBArray;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;
@@ -35,8 +35,8 @@ 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 _VisualDVM.Passes.PassCode;
import Common.Passes.PassException;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import com.mxgraph.swing.mxGraphComponent;
import com.sun.org.glassfish.gmbal.Description;
import javafx.util.Pair;
@@ -213,6 +213,32 @@ public class db_project_info extends DBObject {
db.Disconnect();
}
//-
public static File get_db_file(File project_home) {
return new File(Paths.get(project_home.toString(), Constants.data,
Global.properties.ProjectDBName).toString());
}
public static String recommendAnalysis(PassCode code_in) {
return Constants.unknown_metric + " примените анализатор \"" + code_in.getDescription() + "\"";
}
public static void ResetNewVersions() {
for (db_project_info version : newVersions) {
version.isNew = false;
}
newVersions.clear();
}
public static int extractVersionNumber(db_project_info version) {
int res = 0;
try {
res = Integer.parseInt(version.name.substring(1));
} catch (Exception ex) {
ex.printStackTrace();
}
return res;
}
public static void sortVersionsByNumber(Vector<db_project_info> versions) {
versions.sort(Comparator.comparingInt(db_project_info::extractVersionNumber));
}
//-
public void Open() throws Exception {
db.Connect();
db.prepareTablesStatements();
@@ -232,14 +258,6 @@ public class db_project_info extends DBObject {
db.Insert(this);
db.Disconnect();
}
//-
public static File get_db_file(File project_home) {
return new File(Paths.get(project_home.toString(), Constants.data,
Global.properties.ProjectDBName).toString());
}
public static String recommendAnalysis(PassCode code_in) {
return Constants.unknown_metric + " примените анализатор \"" + code_in.getDescription() + "\"";
}
/*
public boolean isGCOVDone() {
return gcov_is_done != 0;
@@ -876,12 +894,6 @@ public class db_project_info extends DBObject {
UI.getVersionsWindow().getVersionsForm().getTree().AddNode(node, version.node = new DefaultMutableTreeNode(version));
SaveVersionToBuild("");
}
public static void ResetNewVersions() {
for (db_project_info version : newVersions) {
version.isNew = false;
}
newVersions.clear();
}
public void SaveVersionToBuild(String v_name) throws Exception {
if (!v_name.equalsIgnoreCase(VersionBuilding)) {
VersionBuilding = v_name;
@@ -1276,18 +1288,6 @@ public class db_project_info extends DBObject {
db_project_info root_ = createVersionsTree_r(anchestor_file);
return root_;
}
public static int extractVersionNumber(db_project_info version) {
int res = 0;
try {
res = Integer.parseInt(version.name.substring(1));
} catch (Exception ex) {
ex.printStackTrace();
}
return res;
}
public static void sortVersionsByNumber(Vector<db_project_info> versions) {
versions.sort(Comparator.comparingInt(db_project_info::extractVersionNumber));
}
public db_project_info createVersionsTree_r(File dir) throws Exception {
db_project_info result = null;
File[] files_ = dir.listFiles();

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

@@ -1,5 +1,6 @@
package _VisualDVM.ProjectData;
import Common.Database.SQLITE.SQLiteDatabase;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.DBArray.ArraysDBTable;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileType;
@@ -12,7 +13,6 @@ import _VisualDVM.ProjectData.PredictorStatistic.PredictorStatisticsDBTable;
import _VisualDVM.ProjectData.Project.ProjectInfoDBTable;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinatesDBTable;
import _VisualDVM.Passes.PassCode;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;

8
src/_VisualDVM/ProjectData/ProjectView.java
View File

@@ -4,8 +4,8 @@ public enum ProjectView {
Includes,
FunctionsCallsPoints,
FunctionsHierarchy;
public String getIcon(){
switch (this){
public String getIcon() {
switch (this) {
case Files:
return "/icons/Editor/Paste.png";
case Includes:
@@ -18,8 +18,8 @@ public enum ProjectView {
return "";
}
}
public String getDescription(){
switch (this){
public String getDescription() {
switch (this) {
case Files:
return "Файлы";
case Includes:

4
src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
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()));
}
}

4
src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
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.*;

1
src/_VisualDVM/ProjectData/SapforData/Arrays/Templates/TemplateDimensionState.java
View File

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

4
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
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.*;

6
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
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> {

5
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
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;

6
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
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());
}
}

1
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/FileArraysTree.java
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 {

7
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java
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;

2
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
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.*;

5
src/_VisualDVM/ProjectData/SapforData/FileObject.java
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 {

4
src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java
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()));

4
src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java
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()));

2
src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java
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;

1
src/_VisualDVM/ProjectData/SapforData/Functions/UI/FileFunctionsTree.java
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 {

3
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
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;

6
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
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;

5
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
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) {

1
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java
View File

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

5
src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineMenu.java
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);

2
src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineMenu2.java
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 {

7
src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java
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);

7
src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java
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);

5
src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesMenu.java
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);

4
src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java
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);

2
src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java
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;

1
src/_VisualDVM/ProjectData/SapforData/Loops/UI/FileLoopsTree.java
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 {

5
src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java
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);

2
src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
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;

1
src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java
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;

7
src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java
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();

3
src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java
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