From dc17b7d741ab47177034751ea4871931880e3024 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 13 Apr 2025 18:59:33 +0300
Subject: [PATCH] =?UTF-8?q?++=20=D0=B3=D1=80=D0=B0=D1=84=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D1=86=D0=B5=D0=B4=D1=83=D1=80=20=D0=BD=D0=B0=20json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                            |  6 ++++--
 src/_VisualDVM/Constants.java                  |  2 +-
 .../ProjectData/Files/UI/FileGraphTree.java    | 10 ++++++++--
 .../Visual/Interface/FileWindow.java           |  4 +++-
 src/_VisualDVM/Visual/Windows/FileForm.java    | 18 +++++++++++++-----
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 931672c6..65b71131 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,10 @@
   <component name="ChangeListManager">
     <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$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" 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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 84ae7abe..0132c68c 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 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 testingMaxKernels = 64;
     //--
diff --git a/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java b/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java
index 7b2493a2..1a3c1125 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java
@@ -24,8 +24,14 @@ public class FileGraphTree extends DataTree {
     public void ShowCurrentObject() throws Exception {
         Global.mainModule.getFile().form.EventsOff();
         Object o = Global.mainModule.get(currentName());
-        Global.mainModule.getFile().form.getEditor().gotoLine((o instanceof FileObjectWithMessages) ? (((FileObjectWithMessages) o).line) : 1);
-        Global.mainModule.getFile().form.ShowMessages();
+        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.EventsOn();
     }
     @Override
diff --git a/src/_VisualDVM/Visual/Interface/FileWindow.java b/src/_VisualDVM/Visual/Interface/FileWindow.java
index ddc9288f..3713e8f7 100644
--- a/src/_VisualDVM/Visual/Interface/FileWindow.java
+++ b/src/_VisualDVM/Visual/Interface/FileWindow.java
@@ -1,5 +1,6 @@
 package _VisualDVM.Visual.Interface;
 import Common.Visual.VisualizerForm;
+import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
 public interface FileWindow extends VisualizerForm {
     void ShowText();
     void ShowLanguage();
@@ -11,6 +12,7 @@ public interface FileWindow extends VisualizerForm {
         ShowStyle();
     }
     void ShowMessages();
+    void ShowMessages(FileObjectWithMessages graphElement);
     void ShowNoMessages();
     void ShowLoops();
     void ShowNoLoops();
@@ -21,7 +23,7 @@ public interface FileWindow extends VisualizerForm {
     void ShowArrays();
     void ShowNoArrays();
     void ShowCaretInfo();
-    void FocusMessagesPriority();
+    void FocusMessagesPriority(String messages_precense);
     void ShowFirstError();
     //-
     void ShowCompilationOutput();
diff --git a/src/_VisualDVM/Visual/Windows/FileForm.java b/src/_VisualDVM/Visual/Windows/FileForm.java
index aca03105..c0da10a8 100644
--- a/src/_VisualDVM/Visual/Windows/FileForm.java
+++ b/src/_VisualDVM/Visual/Windows/FileForm.java
@@ -11,6 +11,7 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.ProjectData.SapforData.Arrays.UI.FileArraysTree;
+import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
 import _VisualDVM.ProjectData.SapforData.Functions.UI.FileFunctionsTree;
 import _VisualDVM.ProjectData.SapforData.Loops.UI.FileLoopsTree;
 import _VisualDVM.Visual.Interface.FileWindow;
@@ -212,6 +213,10 @@ public class FileForm implements FileWindow, FormWithSplitters {
     }
     @Override
     public void ShowMessages() {
+        ShowMessages(null);
+    }
+    @Override
+    public void ShowMessages(FileObjectWithMessages graphElement) {
         file.father.db.notes.ShowUI();
         file.father.db.warnings.ShowUI();
         file.father.db.errors.ShowUI();
@@ -221,7 +226,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
         ShowErrorsCount();
         ShowRecommendationsCount();
         //-
-        FocusMessagesPriority();
+        FocusMessagesPriority(graphElement==null? file.state.toString(): graphElement.messages_presence);
     }
     @Override
     public void ShowNoMessages() {
@@ -309,14 +314,17 @@ public class FileForm implements FileWindow, FormWithSplitters {
         }
     }
     @Override
-    public void FocusMessagesPriority() {
-        switch (file.state) {
-            case HasErrors:
+    public void FocusMessagesPriority(String messages_presence) {
+        switch (messages_presence) {
+            case "HasErrors":
                 messagesTabs.setSelectedIndex(2);
                 break;
-            case HasWarnings:
+            case "HasWarnings":
                 messagesTabs.setSelectedIndex(1);
                 break;
+            case "HasNotes":
+                messagesTabs.setSelectedIndex(0);
+                break;
             default:
                 messagesTabs.setSelectedIndex(0);
                 break;