проверка на пустоту сообщений при распаковке
++
This commit is contained in:
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
|
||||
|
||||
import java.util.Vector;
|
||||
public class Constants {
|
||||
public static final int version = 1252;
|
||||
public static final int version = 1253;
|
||||
public static final int planner_version = 24;
|
||||
public static final int testingMaxKernels = 64;
|
||||
//--
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -1141,15 +1141,17 @@ public class db_project_info extends DBObject {
|
||||
}
|
||||
///------------------------------------------------------------------------------------------->>>>>
|
||||
public void unpackMessagesAndLog(String packed_messages, String log_in) throws Exception {
|
||||
MessagesJson messages = Utils_.gson.fromJson(packed_messages, MessagesJson.class);
|
||||
for (FileMessagesJson fileMessages: messages.allMessages){
|
||||
fileMessages.file=Utils_.toW(fileMessages.file);
|
||||
//--
|
||||
DBProjectFile messageFile = db.files.Data.get(fileMessages.file);
|
||||
for (Message message: fileMessages.messages){
|
||||
messageFile.AddNewMessage(message);
|
||||
if (!packed_messages.isEmpty()) {
|
||||
MessagesJson messages = Utils_.gson.fromJson(packed_messages, MessagesJson.class);
|
||||
for (FileMessagesJson fileMessages : messages.allMessages) {
|
||||
fileMessages.file = Utils_.toW(fileMessages.file);
|
||||
//--
|
||||
DBProjectFile messageFile = db.files.Data.get(fileMessages.file);
|
||||
for (Message message : fileMessages.messages) {
|
||||
messageFile.AddNewMessage(message);
|
||||
}
|
||||
messageFile.father.db.Update(messageFile);
|
||||
}
|
||||
messageFile.father.db.Update(messageFile);
|
||||
}
|
||||
Log = log_in;
|
||||
Update();
|
||||
|
||||
@@ -9,13 +9,12 @@ public class IncludeToInsertJson {
|
||||
@Expose
|
||||
public int line;
|
||||
//--
|
||||
public IncludeToInsertJson(){
|
||||
|
||||
public IncludeToInsertJson() {
|
||||
}
|
||||
//--
|
||||
public IncludeToInsertJson(String includeName_in, String fileName_in, int line_in){
|
||||
public IncludeToInsertJson(String includeName_in, String fileName_in, int line_in) {
|
||||
includeName = Utils_.toU(includeName_in);
|
||||
fileName = Utils_.toU(fileName_in);
|
||||
line= line_in;
|
||||
line = line_in;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user