распаковка сообщений от парсера
This commit is contained in:
@@ -58,7 +58,7 @@ public class Constants {
|
||||
public static final String package_json = "package_json";
|
||||
public static final String results_json = "results_json";
|
||||
//--
|
||||
public static final int parser_group = -1;
|
||||
public static final int parser_group = 6000;
|
||||
public static final int compiler_group = -2;
|
||||
// DBProjectFile
|
||||
public static final String no_data = "Нет данных";
|
||||
|
||||
@@ -58,16 +58,16 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
|
||||
}
|
||||
@Override
|
||||
protected void unpackMessages() throws Exception {
|
||||
target.updateLog(sapfor.getOutput());
|
||||
System.out.println("packed="+sapfor.getOutputMessage());
|
||||
for (DBProjectFile f : target.db.files.Data.values())
|
||||
if (f.isActive()) f.state = FileState.OK;
|
||||
super.unpackMessages();
|
||||
projLines.clear();
|
||||
goodCount = 0;
|
||||
badCount = 0;
|
||||
for (DBProjectFile f : target.db.files.Data.values())
|
||||
if (f.isActive()) f.state = FileState.OK;
|
||||
for (DBProjectFile f : target.db.files.Data.values()) {
|
||||
f.ReadParseMessages();
|
||||
f.father.db.Update(f);
|
||||
if (f.isActive()) {
|
||||
System.out.println("file="+f.name+":"+f.state);
|
||||
switch (f.state) {
|
||||
case OK:
|
||||
case HasNotes:
|
||||
@@ -105,7 +105,6 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
|
||||
@Override
|
||||
protected void unpack(String packed) throws Exception {
|
||||
FilesOrderJson filesOrderJson = Utils_.gson.fromJson(packed, FilesOrderJson.class);
|
||||
System.out.println(packed);
|
||||
for (String fileName_ :filesOrderJson.allFiles)
|
||||
target.files_order.add(Utils_.toW(fileName_));
|
||||
}
|
||||
@@ -157,22 +156,9 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
|
||||
sapfor.cd(target.Home);
|
||||
Global.mainModule.getPass(PassCode.RestoreSavedArrays).Do();
|
||||
setDone();
|
||||
/*
|
||||
//особенность парса. журнал появляется только сейчас.
|
||||
if (!sapfor.getOutput().isEmpty()) {
|
||||
target.updateLog(sapfor.getOutput());
|
||||
}
|
||||
*/
|
||||
Sapfor.transformationPermission = TransformationPermission.All;
|
||||
SPFEditor.enable_text_changed = true;
|
||||
}
|
||||
/*
|
||||
@Override
|
||||
protected void showDone() throws Exception {
|
||||
super.showDone();
|
||||
UI.getNewMainWindow().getProjectWindow().ShowProjectSapforLog();
|
||||
}
|
||||
*/
|
||||
@Override
|
||||
protected void performFinish() throws Exception {
|
||||
target.sapforProperties.PARSE_FOR_INLINE = false;
|
||||
|
||||
@@ -1149,6 +1149,7 @@ public class db_project_info extends DBObject {
|
||||
for (Message message: fileMessages.messages){
|
||||
messageFile.AddNewMessage(message);
|
||||
}
|
||||
messageFile.father.db.Update(messageFile);
|
||||
}
|
||||
Log = log_in;
|
||||
Update();
|
||||
|
||||
Reference in New Issue
Block a user