проверка на пустоту сообщений при распаковке

++
This commit is contained in:
2025-06-12 13:32:49 +03:00
parent 641ce80102
commit f2644392ad
6 changed files with 48 additions and 20 deletions

View File

@@ -6,14 +6,9 @@ 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;
public class SPF_InsertIncludesPass extends SapforTransformation {
@Override
protected PassCode necessary() {
@@ -21,6 +16,34 @@ 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_("Не найдено файлов, имеющих зависимости по включению.");
@@ -41,7 +64,8 @@ public class SPF_InsertIncludesPass extends SapforTransformation {
return true;
}
return false;
}
*/
@Override
protected void FocusBeforeStart() {
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusDependencies();