From ddf04c6f390ada9923819b44165e63599d2efb47 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 31 Mar 2025 14:40:09 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  5 ++--
 .../Passes/All/SPF_GetGraphLoops.java         | 26 +++++++------------
 .../ProjectData/SapforData/FileObject.java    |  4 ++-
 .../SapforData/Loops/Json/FileLoopsJson.java  |  9 +++++++
 .../SapforData/Loops/Json/LoopsJson.java      |  2 +-
 .../ProjectData/SapforData/Loops/Loop.java    |  7 +++++
 6 files changed, 32 insertions(+), 21 deletions(-)
 create mode 100644 src/_VisualDVM/ProjectData/SapforData/Loops/Json/FileLoopsJson.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2a6bec8c..03224ba8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,10 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/Json/FileLoopsJson.java" 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/Passes/All/SPF_GetGraphLoops.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.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$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/Json/LoopsJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/Json/LoopsJson.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java b/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java
index 98db70e9..33d1008c 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java
@@ -3,6 +3,7 @@ import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
+import _VisualDVM.ProjectData.SapforData.Loops.Json.FileLoopsJson;
 import _VisualDVM.ProjectData.SapforData.Loops.Json.LoopsJson;
 import _VisualDVM.ProjectData.SapforData.Loops.Loop;
 import _VisualDVM.ProjectData.SapforData.Loops.LoopState;
@@ -42,25 +43,16 @@ public class SPF_GetGraphLoops extends SapforAnalysis {
         Vector<String> loops_programs = new Vector<>();
        /// System.out.println(packed);
         LoopsJson loopsJson = Utils_.gson.fromJson(packed, LoopsJson.class);
-        for (Loop loop: loopsJson.loops){
-            System.out.println("loop "+"file="+loop.file+" line="+loop.line);
-
-            target.db.files.get(loop.file).LoopNests.add(loop);
+        for (FileLoopsJson fileLoopsJson: loopsJson.loops){
+            for (Loop loop: fileLoopsJson.loops)
+                loop.setFile(fileLoopsJson.file);
             //-
-            if (!loops_programs.contains(loop.file)){
-                loops_programs.add(loop.file);
-            }
+            DBProjectFile dbProjectFile = target.db.files.get(fileLoopsJson.file);
+            dbProjectFile.saveAllLoops();
+            dbProjectFile.LoopGraphTitle = "Всего циклов: " + dbProjectFile.AllLoops.size();
+            //-
+            target.numLoops += dbProjectFile.AllLoops.size();
         }
-        System.out.println("======");
-        //-
-        /*
-        for (String program_name: loops_programs){
-            DBProjectFile program = target.db.files.get(program_name);
-            program.saveAllLoops();
-            program.LoopGraphTitle = "Всего циклов: " + program.AllLoops.size();
-            target.numLoops += program.AllLoops.size();
-        }
-         */
     }
     @Override
     protected void FocusResult() {
diff --git a/src/_VisualDVM/ProjectData/SapforData/FileObject.java b/src/_VisualDVM/ProjectData/SapforData/FileObject.java
index 5f3179fd..91c85e00 100644
--- a/src/_VisualDVM/ProjectData/SapforData/FileObject.java
+++ b/src/_VisualDVM/ProjectData/SapforData/FileObject.java
@@ -8,7 +8,6 @@ import com.google.gson.annotations.Expose;
 import com.sun.org.glassfish.gmbal.Description;
 //объект принадлежащий файлу и относящийся к его строке.
 public class FileObject implements Selectable {
-    @Expose
     public String file = "";
     @Expose
     public int line = 1;
@@ -38,4 +37,7 @@ public class FileObject implements Selectable {
         selected = flag;
     }
     //-------
+    public void setFile(String file_in){
+        file = file_in;
+    }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Loops/Json/FileLoopsJson.java b/src/_VisualDVM/ProjectData/SapforData/Loops/Json/FileLoopsJson.java
new file mode 100644
index 00000000..8d46cf7d
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Loops/Json/FileLoopsJson.java
@@ -0,0 +1,9 @@
+package _VisualDVM.ProjectData.SapforData.Loops.Json;
+import _VisualDVM.ProjectData.SapforData.Loops.Loop;
+
+import java.util.List;
+import java.util.Vector;
+public class FileLoopsJson {
+    public String file;
+    public List<Loop> loops = new Vector<>();
+}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Loops/Json/LoopsJson.java b/src/_VisualDVM/ProjectData/SapforData/Loops/Json/LoopsJson.java
index 8f63eb77..43c39e64 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Loops/Json/LoopsJson.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Loops/Json/LoopsJson.java
@@ -6,5 +6,5 @@ import java.util.List;
 import java.util.Vector;
 public class LoopsJson {
     @Expose
-    public List<Loop> loops = new Vector<>();
+    public List<FileLoopsJson> loops = new Vector<>();
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java b/src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java
index efc5bc5b..316cf8dc 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java
@@ -1,6 +1,7 @@
 package _VisualDVM.ProjectData.SapforData.Loops;
 import Common.Visual.Fonts.VisualiserFonts;
 import _VisualDVM.ProjectData.Messages.Message;
+import _VisualDVM.ProjectData.SapforData.FileObject;
 import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
 import com.google.gson.annotations.Expose;
@@ -79,4 +80,10 @@ public class Loop extends FileObjectWithMessages {
         for (Loop loop: children)
             loop.toMap_r(loops_map);
     }
+    @Override
+    public void setFile(String file_in) {
+        super.setFile(file_in);
+        for (FileObject fileObject: getAllChildren())
+            fileObject.setFile(file_in);
+    }
 }