граф процедур на json
This commit is contained in:
2025-04-13 18:59:33 +03:00
parent eb86b936bc
commit dc17b7d741
5 changed files with 29 additions and 11 deletions

6
.idea/workspace.xml generated
View File

@@ -8,8 +8,10 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FileWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FileWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
import java.util.Vector; import java.util.Vector;
public class Constants { public class Constants {
public static final int version = 1238; public static final int version = 1239;
public static final int planner_version = 24; public static final int planner_version = 24;
public static final int testingMaxKernels = 64; public static final int testingMaxKernels = 64;
//-- //--

View File

@@ -24,8 +24,14 @@ public class FileGraphTree extends DataTree {
public void ShowCurrentObject() throws Exception { public void ShowCurrentObject() throws Exception {
Global.mainModule.getFile().form.EventsOff(); Global.mainModule.getFile().form.EventsOff();
Object o = Global.mainModule.get(currentName()); Object o = Global.mainModule.get(currentName());
Global.mainModule.getFile().form.getEditor().gotoLine((o instanceof FileObjectWithMessages) ? (((FileObjectWithMessages) o).line) : 1); if (o instanceof FileObjectWithMessages){
FileObjectWithMessages f = (FileObjectWithMessages) o;
Global.mainModule.getFile().form.getEditor().gotoLine(f.line);
Global.mainModule.getFile().form.ShowMessages(f);
}else {
Global.mainModule.getFile().form.getEditor().gotoLine(1);
Global.mainModule.getFile().form.ShowMessages(); Global.mainModule.getFile().form.ShowMessages();
}
Global.mainModule.getFile().form.EventsOn(); Global.mainModule.getFile().form.EventsOn();
} }
@Override @Override

View File

@@ -1,5 +1,6 @@
package _VisualDVM.Visual.Interface; package _VisualDVM.Visual.Interface;
import Common.Visual.VisualizerForm; import Common.Visual.VisualizerForm;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
public interface FileWindow extends VisualizerForm { public interface FileWindow extends VisualizerForm {
void ShowText(); void ShowText();
void ShowLanguage(); void ShowLanguage();
@@ -11,6 +12,7 @@ public interface FileWindow extends VisualizerForm {
ShowStyle(); ShowStyle();
} }
void ShowMessages(); void ShowMessages();
void ShowMessages(FileObjectWithMessages graphElement);
void ShowNoMessages(); void ShowNoMessages();
void ShowLoops(); void ShowLoops();
void ShowNoLoops(); void ShowNoLoops();
@@ -21,7 +23,7 @@ public interface FileWindow extends VisualizerForm {
void ShowArrays(); void ShowArrays();
void ShowNoArrays(); void ShowNoArrays();
void ShowCaretInfo(); void ShowCaretInfo();
void FocusMessagesPriority(); void FocusMessagesPriority(String messages_precense);
void ShowFirstError(); void ShowFirstError();
//- //-
void ShowCompilationOutput(); void ShowCompilationOutput();

View File

@@ -11,6 +11,7 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor; import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.FileArraysTree; import _VisualDVM.ProjectData.SapforData.Arrays.UI.FileArraysTree;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
import _VisualDVM.ProjectData.SapforData.Functions.UI.FileFunctionsTree; import _VisualDVM.ProjectData.SapforData.Functions.UI.FileFunctionsTree;
import _VisualDVM.ProjectData.SapforData.Loops.UI.FileLoopsTree; import _VisualDVM.ProjectData.SapforData.Loops.UI.FileLoopsTree;
import _VisualDVM.Visual.Interface.FileWindow; import _VisualDVM.Visual.Interface.FileWindow;
@@ -212,6 +213,10 @@ public class FileForm implements FileWindow, FormWithSplitters {
} }
@Override @Override
public void ShowMessages() { public void ShowMessages() {
ShowMessages(null);
}
@Override
public void ShowMessages(FileObjectWithMessages graphElement) {
file.father.db.notes.ShowUI(); file.father.db.notes.ShowUI();
file.father.db.warnings.ShowUI(); file.father.db.warnings.ShowUI();
file.father.db.errors.ShowUI(); file.father.db.errors.ShowUI();
@@ -221,7 +226,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
ShowErrorsCount(); ShowErrorsCount();
ShowRecommendationsCount(); ShowRecommendationsCount();
//- //-
FocusMessagesPriority(); FocusMessagesPriority(graphElement==null? file.state.toString(): graphElement.messages_presence);
} }
@Override @Override
public void ShowNoMessages() { public void ShowNoMessages() {
@@ -309,14 +314,17 @@ public class FileForm implements FileWindow, FormWithSplitters {
} }
} }
@Override @Override
public void FocusMessagesPriority() { public void FocusMessagesPriority(String messages_presence) {
switch (file.state) { switch (messages_presence) {
case HasErrors: case "HasErrors":
messagesTabs.setSelectedIndex(2); messagesTabs.setSelectedIndex(2);
break; break;
case HasWarnings: case "HasWarnings":
messagesTabs.setSelectedIndex(1); messagesTabs.setSelectedIndex(1);
break; break;
case "HasNotes":
messagesTabs.setSelectedIndex(0);
break;
default: default:
messagesTabs.setSelectedIndex(0); messagesTabs.setSelectedIndex(0);
break; break;