From b8d10a1434e9366fdfcd6d8c8eb5fd5d84823fd5 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 22 May 2025 14:11:38 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=20json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                    |  7 ++++++-
 properties                                             |  2 +-
 src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java |  5 ++++-
 .../ProjectData/Messages/FileMessagesJson.java         | 10 ++++++++++
 src/_VisualDVM/ProjectData/Messages/Message.java       |  1 +
 src/_VisualDVM/ProjectData/Messages/MessagesJson.java  |  8 ++++++++
 6 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 src/_VisualDVM/ProjectData/Messages/FileMessagesJson.java
 create mode 100644 src/_VisualDVM/ProjectData/Messages/MessagesJson.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 359c7ced..6cfffc9e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <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>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 5c3567d5..188d9358 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\BUG",
+  "ProjectsSearchDirectory": "E:\\SAPFOR\\Tests",
   "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
diff --git a/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
index 06b76003..ae8a4fde 100644
--- a/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
+++ b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
@@ -8,6 +8,7 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.FileState;
+import _VisualDVM.ProjectData.Files.FilesOrderJson;
 import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
 import org.apache.commons.io.FileUtils;
 
@@ -103,7 +104,9 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
     }
     @Override
     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_));
     }
     @Override
diff --git a/src/_VisualDVM/ProjectData/Messages/FileMessagesJson.java b/src/_VisualDVM/ProjectData/Messages/FileMessagesJson.java
new file mode 100644
index 00000000..17e9f87b
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/Messages/FileMessagesJson.java
@@ -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;
+}
diff --git a/src/_VisualDVM/ProjectData/Messages/Message.java b/src/_VisualDVM/ProjectData/Messages/Message.java
index f7a4c539..5abfcca3 100644
--- a/src/_VisualDVM/ProjectData/Messages/Message.java
+++ b/src/_VisualDVM/ProjectData/Messages/Message.java
@@ -25,6 +25,7 @@ public class Message extends iDBObject {
     public String group_s = "#";
     @Expose
     public String value;
+    //--
     public Message() {
     }
     public Message(String file_in, int line_in, String value_in, int group_in
diff --git a/src/_VisualDVM/ProjectData/Messages/MessagesJson.java b/src/_VisualDVM/ProjectData/Messages/MessagesJson.java
new file mode 100644
index 00000000..22c6e9c1
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/Messages/MessagesJson.java
@@ -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;
+}