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

сообщения в json

Browse Source
This commit is contained in:
02090095
2025-05-22 14:11:38 +03:00
parent 46cdd480bc
commit b8d10a1434
6 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/workspace.xml generated
View File

@@ -7,7 +7,12 @@
</component> </component>
<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$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/FileMessagesJson.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesJson.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.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" />

2
properties
View File

@@ -4,7 +4,7 @@
"ServerUserPassword": "mprit_2011", "ServerUserPassword": "mprit_2011",
"OfferRegistrationOnStart": true, "OfferRegistrationOnStart": true,
"Workspace": "E:\\Tests", "Workspace": "E:\\Tests",
"ProjectsSearchDirectory": "E:\\BUG", "ProjectsSearchDirectory": "E:\\SAPFOR\\Tests",
"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",

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

@@ -8,6 +8,7 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforAnalysis; import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState; import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.ProjectData.Files.FilesOrderJson;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor; import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
@@ -103,7 +104,9 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
} }
@Override @Override
protected void unpack(String packed) throws Exception { protected void unpack(String packed) throws Exception {
for (String fileName_ : packed.split("\\|")) FilesOrderJson filesOrderJson = Utils_.gson.fromJson(packed, FilesOrderJson.class);
System.out.println(packed);
for (String fileName_ :filesOrderJson.allFiles)
target.files_order.add(Utils_.toW(fileName_)); target.files_order.add(Utils_.toW(fileName_));
} }
@Override @Override

10
src/_VisualDVM/ProjectData/Messages/FileMessagesJson.java Normal file
View File

@@ -0,0 +1,10 @@
package _VisualDVM.ProjectData.Messages;
import com.google.gson.annotations.Expose;
import java.util.List;
public class FileMessagesJson {
@Expose
public String file;
@Expose
public List<Message> messages;
}

1
src/_VisualDVM/ProjectData/Messages/Message.java
View File

@@ -25,6 +25,7 @@ public class Message extends iDBObject {
public String group_s = "#"; public String group_s = "#";
@Expose @Expose
public String value; public String value;
//--
public Message() { public Message() {
} }
public Message(String file_in, int line_in, String value_in, int group_in public Message(String file_in, int line_in, String value_in, int group_in

8
src/_VisualDVM/ProjectData/Messages/MessagesJson.java Normal file
View File

@@ -0,0 +1,8 @@
package _VisualDVM.ProjectData.Messages;
import com.google.gson.annotations.Expose;
import java.util.List;
public class MessagesJson {
@Expose
public List<FileMessagesJson> allMessages;
}