распаковка сообщений от парсера
This commit is contained in:
7
.idea/workspace.xml
generated
7
.idea/workspace.xml
generated
@@ -8,11 +8,10 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<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$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" 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/ProjectData/Messages/MessagesControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.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/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/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.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" />
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
"ServerUserPassword": "mprit_2011",
|
"ServerUserPassword": "mprit_2011",
|
||||||
"OfferRegistrationOnStart": true,
|
"OfferRegistrationOnStart": true,
|
||||||
"Workspace": "E:\\Tests",
|
"Workspace": "E:\\Tests",
|
||||||
"ProjectsSearchDirectory": "E:\\SAPFOR\\Tests",
|
"ProjectsSearchDirectory": "E:\\BUG",
|
||||||
"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",
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ public class Constants {
|
|||||||
public static final String package_json = "package_json";
|
public static final String package_json = "package_json";
|
||||||
public static final String results_json = "results_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;
|
public static final int compiler_group = -2;
|
||||||
// DBProjectFile
|
// DBProjectFile
|
||||||
public static final String no_data = "Нет данных";
|
public static final String no_data = "Нет данных";
|
||||||
|
|||||||
@@ -58,16 +58,16 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void unpackMessages() throws Exception {
|
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();
|
projLines.clear();
|
||||||
goodCount = 0;
|
goodCount = 0;
|
||||||
badCount = 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()) {
|
for (DBProjectFile f : target.db.files.Data.values()) {
|
||||||
f.ReadParseMessages();
|
|
||||||
f.father.db.Update(f);
|
|
||||||
if (f.isActive()) {
|
if (f.isActive()) {
|
||||||
|
System.out.println("file="+f.name+":"+f.state);
|
||||||
switch (f.state) {
|
switch (f.state) {
|
||||||
case OK:
|
case OK:
|
||||||
case HasNotes:
|
case HasNotes:
|
||||||
@@ -105,7 +105,6 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
|
|||||||
@Override
|
@Override
|
||||||
protected void unpack(String packed) throws Exception {
|
protected void unpack(String packed) throws Exception {
|
||||||
FilesOrderJson filesOrderJson = Utils_.gson.fromJson(packed, FilesOrderJson.class);
|
FilesOrderJson filesOrderJson = Utils_.gson.fromJson(packed, FilesOrderJson.class);
|
||||||
System.out.println(packed);
|
|
||||||
for (String fileName_ :filesOrderJson.allFiles)
|
for (String fileName_ :filesOrderJson.allFiles)
|
||||||
target.files_order.add(Utils_.toW(fileName_));
|
target.files_order.add(Utils_.toW(fileName_));
|
||||||
}
|
}
|
||||||
@@ -157,22 +156,9 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
|
|||||||
sapfor.cd(target.Home);
|
sapfor.cd(target.Home);
|
||||||
Global.mainModule.getPass(PassCode.RestoreSavedArrays).Do();
|
Global.mainModule.getPass(PassCode.RestoreSavedArrays).Do();
|
||||||
setDone();
|
setDone();
|
||||||
/*
|
|
||||||
//особенность парса. журнал появляется только сейчас.
|
|
||||||
if (!sapfor.getOutput().isEmpty()) {
|
|
||||||
target.updateLog(sapfor.getOutput());
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
Sapfor.transformationPermission = TransformationPermission.All;
|
Sapfor.transformationPermission = TransformationPermission.All;
|
||||||
SPFEditor.enable_text_changed = true;
|
SPFEditor.enable_text_changed = true;
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
@Override
|
|
||||||
protected void showDone() throws Exception {
|
|
||||||
super.showDone();
|
|
||||||
UI.getNewMainWindow().getProjectWindow().ShowProjectSapforLog();
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
protected void performFinish() throws Exception {
|
protected void performFinish() throws Exception {
|
||||||
target.sapforProperties.PARSE_FOR_INLINE = false;
|
target.sapforProperties.PARSE_FOR_INLINE = false;
|
||||||
|
|||||||
@@ -1149,6 +1149,7 @@ public class db_project_info extends DBObject {
|
|||||||
for (Message message: fileMessages.messages){
|
for (Message message: fileMessages.messages){
|
||||||
messageFile.AddNewMessage(message);
|
messageFile.AddNewMessage(message);
|
||||||
}
|
}
|
||||||
|
messageFile.father.db.Update(messageFile);
|
||||||
}
|
}
|
||||||
Log = log_in;
|
Log = log_in;
|
||||||
Update();
|
Update();
|
||||||
|
|||||||
Reference in New Issue
Block a user