M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

подстановка инклудов — передача параметров

Browse Source
This commit is contained in:
02090095
2025-06-13 14:45:18 +03:00
parent f2644392ad
commit 83d48d4db1
3 changed files with 4 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/workspace.xml generated
View File

@@ -9,10 +9,7 @@
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <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$/.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$/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/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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

2
properties
View File

@@ -4,7 +4,7 @@
"ServerUserPassword": "mprit_2011", "ServerUserPassword": "mprit_2011",
"OfferRegistrationOnStart": true, "OfferRegistrationOnStart": true,
"Workspace": "E:\\Tests", "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", "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
"VisualiserPath": "C:\\Users\\misha\\Downloads", "VisualiserPath": "C:\\Users\\misha\\Downloads",
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F", "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",

33
src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
View File

@@ -6,6 +6,8 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforTransformation; import _VisualDVM.Passes.Sapfor.SapforTransformation;
import _VisualDVM.ProjectData.SapforData.Includes.Analysis.FileInfo; import _VisualDVM.ProjectData.SapforData.Includes.Analysis.FileInfo;
import _VisualDVM.ProjectData.SapforData.Includes.Analysis.Include; 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.Vector;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -16,34 +18,6 @@ public class SPF_InsertIncludesPass extends SapforTransformation {
} }
@Override @Override
protected boolean canStart(Object... args) throws Exception { 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 (super.canStart(args)) {
if (target.numAddicted <= 0) { if (target.numAddicted <= 0) {
Log.Writeln_("Не найдено файлов, имеющих зависимости по включению."); Log.Writeln_("Не найдено файлов, имеющих зависимости по включению.");
@@ -64,8 +38,7 @@ public class SPF_InsertIncludesPass extends SapforTransformation {
return true; return true;
} }
return false; return false;
}
*/
@Override @Override
protected void FocusBeforeStart() { protected void FocusBeforeStart() {
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusDependencies(); Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusDependencies();