diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d7aa18bc..a29dbd18 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,10 +9,7 @@
-
-
-
diff --git a/properties b/properties
index 9f6592fd..4c03b8df 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
"ServerUserPassword": "mprit_2011",
"OfferRegistrationOnStart": true,
"Workspace": "E:\\Tests",
- "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1749652835\\tmp_influxsys\\v3",
+ "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1701089001",
"DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
"VisualiserPath": "C:\\Users\\misha\\Downloads",
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
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 Result = new Vector<>();
- for (FileInfo fileInfo : target.addictedFiles.values()) {
- Vector 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();