From ed3d133dcd137552f4657b07a045aa6b20322543 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 13 Jun 2025 12:30:14 +0300
Subject: [PATCH] =?UTF-8?q?=D1=82=D0=B5=D1=81=D1=82=20=D0=B2=D0=B5=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  4 ---
 .../Passes/All/SPF_InsertIncludesPass.java    | 33 ++-----------------
 2 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d7aa18bc..d69e2d88 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,11 +8,7 @@
   <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$/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_InsertIncludesPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludeToInsertJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludeToInsertJson.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java b/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
index 823aca00..73702421 100644
--- a/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
+++ b/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
@@ -6,6 +6,8 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforTransformation;
 import _VisualDVM.ProjectData.SapforData.Includes.Analysis.FileInfo;
 import _VisualDVM.ProjectData.SapforData.Includes.Analysis.Include;
+import _VisualDVM.ProjectData.SapforData.Includes.Transformation.IncludeToInsertJson;
+import _VisualDVM.ProjectData.SapforData.Includes.Transformation.IncludesToInsertJson;
 
 import java.util.Vector;
 import java.util.stream.Collectors;
@@ -16,34 +18,6 @@ public class SPF_InsertIncludesPass extends SapforTransformation {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (super.canStart(args)) {
-            if (target.numAddicted <= 0) {
-                Log.Writeln_("Не найдено файлов, имеющих зависимости по включению.");
-                return false;
-            }
-            Vector<String> Result = new Vector<>();
-            for (FileInfo fileInfo : target.addictedFiles.values()) {
-                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 (Include di : selected_children) {
-                        Result.add(String.valueOf(di.line));
-                        Result.add(di.dependencyFileName);
-                    }
-                }
-            }
-            if (Result.isEmpty()) {
-                Log.Writeln_("Не отмечено ни одного заголовка для подстановки");
-                return false;
-            }
-            Options = Utils_.toU(String.join("|", Result));
-            return true;
-        }
-        return false;
-    }
-
-        /*
         if (super.canStart(args)) {
             if (target.numAddicted <= 0) {
                 Log.Writeln_("Не найдено файлов, имеющих зависимости по включению.");
@@ -64,8 +38,7 @@ public class SPF_InsertIncludesPass extends SapforTransformation {
             return true;
         }
         return false;
-
-         */
+    }
     @Override
     protected void FocusBeforeStart() {
         Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusDependencies();