From 8d236c99b8c18e579a84e26016fa389440b9d04c Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 14 Apr 2025 21:58:11 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  6 +-----
 .../All/SPF_GetIncludeDependencies.java       | 19 ++++++++++++-------
 .../Passes/All/SPF_InsertIncludesPass.java    |  2 +-
 .../SapforData/Includes/Include.java          |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dd3eb68d..d25d3925 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,10 @@
   </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$/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" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Include.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Include.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java b/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
index 4d33fac3..5533d56a 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
@@ -4,7 +4,14 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
-import _VisualDVM.ProjectData.SapforData.Includes.Json.IncludesJson;
+import _VisualDVM.ProjectData.Files.FileType;
+import _VisualDVM.ProjectData.Files.LanguageStyle;
+import _VisualDVM.ProjectData.LanguageName;
+import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
+import _VisualDVM.ProjectData.SapforData.Includes.Include;
+import _VisualDVM.Utils;
+
+import javax.swing.tree.DefaultMutableTreeNode;
 public class SPF_GetIncludeDependencies extends SapforAnalysis {
     boolean update_current = false;
     @Override
@@ -27,10 +34,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;
+       // IncludesJson includesJson = Utils_.gson.fromJson(packed, IncludesJson.class);
+       // System.out.println("packed="+packed);
+        update_current = false;
         FileInfo fileInfo = null;
         String[] data_ = packed.split("@");
         for (int i = 0; i < data_.length; ++i) {
@@ -45,7 +51,7 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
                     for (int j = 0; j < data__.length; ++j) {
                         if (data__[j].length() > 0) {
                             fileInfo.dependencies.add(
-                                    new Include(data__[j]));
+                                    new Include(fileInfo.file, data__[j]));
                             //-------------------------------------
                             if (!target.addictedFiles.containsKey(fileInfo.file))
                                 target.addictedFiles.put(fileInfo.file, fileInfo);
@@ -87,7 +93,6 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
         }
         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 7c64d180..6e2bdf10 100644
--- a/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
+++ b/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
@@ -28,7 +28,7 @@ public class SPF_InsertIncludesPass extends SapforTransformation {
                     Result.add(fileInfo.file);
                     Result.add(String.valueOf(selected_children.size()));
                     for (Include di : selected_children)
-                        Result.add(di.file);
+                        Result.add(di.dependencyFileName);
                 }
             }
             if (Result.isEmpty()) {
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/Include.java b/src/_VisualDVM/ProjectData/SapforData/Includes/Include.java
index 38f5ef8f..5dc56c1a 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Includes/Include.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/Include.java
@@ -13,7 +13,7 @@ public class Include extends FileObject {
     }
     @Override
     public String getSelectionText() {
-        return "включение: " + Utils_.Brackets(file);
+        return "включение: " + Utils_.Brackets(dependencyFileName);
     }
     //мб на будущее расширить, в какой строке находится команда икнлудить файл.
     // но это уже к Сапфору