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

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

Browse Source
This commit is contained in:
02090095
2025-05-26 00:23:09 +03:00
parent f5eaf3df25
commit b418066932
5 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/workspace.xml generated
View File

@@ -8,11 +8,10 @@
<component name="ChangeListManager">
<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$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" 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/ProjectData/Messages/MessagesControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" 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_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/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

2
properties
View File

@@ -4,7 +4,7 @@
"ServerUserPassword": "mprit_2011",
"OfferRegistrationOnStart": true,
"Workspace": "E:\\Tests",
"ProjectsSearchDirectory": "E:\\SAPFOR\\Tests",
"ProjectsSearchDirectory": "E:\\BUG",
"DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
"VisualiserPath": "C:\\Users\\misha\\Downloads",
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",

2
src/_VisualDVM/Constants.java
View File

@@ -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 = "Нет данных";

24
src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
View File

@@ -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;

1
src/_VisualDVM/ProjectData/Project/db_project_info.java
View File

@@ -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();