From 28eee09056b46fce74974fba526049e20256e69c Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 14 Apr 2025 21:44:19 +0300
Subject: [PATCH] =?UTF-8?q?json=20=D0=B4=D0=BB=D1=8F=20=D0=B8=D0=BD=D0=BA?=
 =?UTF-8?q?=D0=BB=D1=83=D0=B4=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                             | 10 +++++++---
 .../Passes/All/SPF_GetGraphLoops.java           |  1 -
 .../Passes/All/SPF_GetIncludeDependencies.java  | 17 +++++++----------
 .../Passes/All/SPF_InsertIncludesPass.java      |  6 +++---
 .../SapforData/Includes/FileInfo.java           |  4 ++--
 .../{DependencyInfo.java => Include.java}       | 10 ++++++++--
 .../Includes/Json/FileIncludesJson.java         | 12 ++++++++++++
 .../SapforData/Includes/Json/IncludesJson.java  |  8 ++++++++
 8 files changed, 47 insertions(+), 21 deletions(-)
 rename src/_VisualDVM/ProjectData/SapforData/Includes/{DependencyInfo.java => Include.java} (63%)
 create mode 100644 src/_VisualDVM/ProjectData/SapforData/Includes/Json/FileIncludesJson.java
 create mode 100644 src/_VisualDVM/ProjectData/SapforData/Includes/Json/IncludesJson.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9e74ea6b..dd3eb68d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,10 +7,14 @@
   </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/Includes/Json/FileIncludesJson.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Json/IncludesJson.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java" 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/Passes/All/SPF_GetIncludeDependencies.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/DependencyInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Include.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.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 69187d0d..d0d709b1 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java
@@ -38,7 +38,6 @@ public class SPF_GetGraphLoops extends SapforAnalysis {
         LoopsJson loopsJson = Utils_.gson.fromJson(packed, LoopsJson.class);
         for (FileLoopsJson fileLoopsJson : loopsJson.allLoops) {
             fileLoopsJson.file = Utils_.toW(fileLoopsJson.file);
-            System.out.println(fileLoopsJson.file);
             DBProjectFile projectFile = target.db.files.get(fileLoopsJson.file);
             projectFile.saveLoops(fileLoopsJson.loops);
             target.numLoops += projectFile.AllLoops.size();
diff --git a/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java b/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
index 40803842..4d33fac3 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
@@ -4,14 +4,7 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
-import _VisualDVM.ProjectData.Files.FileType;
-import _VisualDVM.ProjectData.Files.LanguageStyle;
-import _VisualDVM.ProjectData.LanguageName;
-import _VisualDVM.ProjectData.SapforData.Includes.DependencyInfo;
-import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
-import _VisualDVM.Utils;
-
-import javax.swing.tree.DefaultMutableTreeNode;
+import _VisualDVM.ProjectData.SapforData.Includes.Json.IncludesJson;
 public class SPF_GetIncludeDependencies extends SapforAnalysis {
     boolean update_current = false;
     @Override
@@ -34,6 +27,9 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
     }
     @Override
     public void unpack(String packed) throws Exception {
+        IncludesJson includesJson = Utils_.gson.fromJson(packed, IncludesJson.class);
+        System.out.println("packed="+packed);
+        /*
         // update_current = false;
         FileInfo fileInfo = null;
         String[] data_ = packed.split("@");
@@ -49,7 +45,7 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
                     for (int j = 0; j < data__.length; ++j) {
                         if (data__[j].length() > 0) {
                             fileInfo.dependencies.add(
-                                    new DependencyInfo(data__[j]));
+                                    new Include(data__[j]));
                             //-------------------------------------
                             if (!target.addictedFiles.containsKey(fileInfo.file))
                                 target.addictedFiles.put(fileInfo.file, fileInfo);
@@ -84,13 +80,14 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
         for (FileInfo file : target.addictedFiles.values()) {
             DefaultMutableTreeNode node = new DefaultMutableTreeNode(
                     file);
-            for (DependencyInfo h : file.dependencies) {
+            for (Include h : file.dependencies) {
                 node.add(new DefaultMutableTreeNode(h));
             }
             target.includes_root.add(node);
         }
         target.numAddicted += target.addictedFiles.size();
         target.UpdateAddictedCount();
+         */
     }
     @Override
     protected void showDone() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java b/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
index 285e61d9..7c64d180 100644
--- a/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
+++ b/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
@@ -4,7 +4,7 @@ import Common.Visual.Selectable;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforTransformation;
-import _VisualDVM.ProjectData.SapforData.Includes.DependencyInfo;
+import _VisualDVM.ProjectData.SapforData.Includes.Include;
 import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
 
 import java.util.Vector;
@@ -23,11 +23,11 @@ public class SPF_InsertIncludesPass extends SapforTransformation {
             }
             Vector<String> Result = new Vector<>();
             for (FileInfo fileInfo : target.addictedFiles.values()) {
-                Vector<DependencyInfo> selected_children = fileInfo.dependencies.stream().filter(Selectable::isSelected).collect(Collectors.toCollection(Vector::new));
+                Vector<Include> selected_children = fileInfo.dependencies.stream().filter(Selectable::isSelected).collect(Collectors.toCollection(Vector::new));
                 if (!selected_children.isEmpty()) {
                     Result.add(fileInfo.file);
                     Result.add(String.valueOf(selected_children.size()));
-                    for (DependencyInfo di : selected_children)
+                    for (Include di : selected_children)
                         Result.add(di.file);
                 }
             }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java b/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java
index cd530815..27f05723 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java
@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Vector;
 public class FileInfo extends FileObject {
     @Expose
-    public List<DependencyInfo> dependencies = new Vector<>();
+    public List<Include> dependencies = new Vector<>();
     public FileInfo(String file_in) {
         super(file_in);
     }
@@ -23,7 +23,7 @@ public class FileInfo extends FileObject {
         return Utils_.getIcon("/Common/icons/File.png");
     }
     public void SelectAllChildren(boolean select) {
-        for (DependencyInfo di : dependencies)
+        for (Include di : dependencies)
             di.Select(select);
     }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/DependencyInfo.java b/src/_VisualDVM/ProjectData/SapforData/Includes/Include.java
similarity index 63%
rename from src/_VisualDVM/ProjectData/SapforData/Includes/DependencyInfo.java
rename to src/_VisualDVM/ProjectData/SapforData/Includes/Include.java
index 63e88cdb..8c8cf7fc 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Includes/DependencyInfo.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/Include.java
@@ -1,9 +1,15 @@
 package _VisualDVM.ProjectData.SapforData.Includes;
 import Common.Utils.Utils_;
 import _VisualDVM.ProjectData.SapforData.FileObject;
-public class DependencyInfo extends FileObject {
-    public DependencyInfo(String file_in) {
+import com.google.gson.annotations.Expose;
+public class Include extends FileObject {
+    //JSON-
+    @Expose
+    public String dependencyName= "";
+    //-----
+    public Include(String file_in, String dependencyName_in) {
         super(file_in);
+        dependencyName = dependencyName_in;
     }
     @Override
     public String getSelectionText() {
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/Json/FileIncludesJson.java b/src/_VisualDVM/ProjectData/SapforData/Includes/Json/FileIncludesJson.java
new file mode 100644
index 00000000..190c0c70
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/Json/FileIncludesJson.java
@@ -0,0 +1,12 @@
+package _VisualDVM.ProjectData.SapforData.Includes.Json;
+import _VisualDVM.ProjectData.SapforData.Includes.Include;
+import com.google.gson.annotations.Expose;
+
+import java.util.List;
+import java.util.Vector;
+public class FileIncludesJson {
+    @Expose
+    public String file;
+    @Expose
+    public List<Include> includes = new Vector<>();
+}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/Json/IncludesJson.java b/src/_VisualDVM/ProjectData/SapforData/Includes/Json/IncludesJson.java
new file mode 100644
index 00000000..a38c2171
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/Json/IncludesJson.java
@@ -0,0 +1,8 @@
+package _VisualDVM.ProjectData.SapforData.Includes.Json;
+import com.google.gson.annotations.Expose;
+
+import java.util.Vector;
+public class IncludesJson {
+    @Expose
+    public Vector<FileIncludesJson> allIncludes = new Vector<>();
+}