From 00a30bdec4229e73e087d2941f9728c2f4268f9e Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 17 Sep 2025 13:39:19 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=80=D1=8B=D0=B9=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B4=20=D0=BF=D0=BE=D0=BA=D0=B0=20=D0=BD=D0=B5=20=D1=83?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=20=D0=B0=20=D0=B7=D0=B0=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B8=D1=80=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  6 +++--
 properties                                    |  2 +-
 .../Component/Sapfor/Sapfor.java              | 22 +++++++++++++++----
 .../Component/Visualizer_2.java               |  5 +++++
 .../SapforData/ModifiedFile_json.java         |  8 +++++++
 .../SapforData/SapforResult_json.java         | 15 ++++++++++++-
 6 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 src/_VisualDVM/ProjectData/SapforData/ModifiedFile_json.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index df9ea720..24048f15 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,10 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforResult_json.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/ModifiedFile_json.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/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforResult_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforResult_json.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 4dabceec..040e66d9 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1750768139\\DIFF3DSYS\\v1\\v1\\v1",
+  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\33136",
   "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/ComponentsServer/Component/Sapfor/Sapfor.java b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
index 517879e4..4c76655a 100644
--- a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
@@ -13,6 +13,8 @@ import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
 import _VisualDVM.ProjectData.Project.db_project_info;
+import _VisualDVM.ProjectData.SapforData.ModifiedFile_json;
+import _VisualDVM.ProjectData.SapforData.SapforResult_json;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.Utils;
 import org.apache.commons.io.FileUtils;
@@ -33,8 +35,6 @@ public abstract class Sapfor extends OSDComponent {
     public Vector<String> Intrinsics = new Vector<>();
     public LinkedHashMap<String, String> ModifiedFiles = new LinkedHashMap<>();
     public LinkedHashMap<String, String> OldFiles = new LinkedHashMap<>();
-    int size;
-    int[] sizes;
     String PID = "";
     private int errorCode;
     private String result;
@@ -502,6 +502,21 @@ public abstract class Sapfor extends OSDComponent {
         this.predictorStats = predictorStats;
     }
     public void decodeString(String runResult) throws Exception {
+        SapforResult_json resultJson = Utils_.gson.fromJson(runResult, SapforResult_json.class);
+        resultJson.Print();
+        //---
+        setErrorCode(resultJson.errorCode);
+        setOutput(resultJson.output);
+        setOutputMessage(resultJson.outputMessage);
+        setPredictorStats(resultJson.predictorStats);
+        //--
+        if (resultJson.files!=null && !resultJson.files.isEmpty()){
+            for (ModifiedFile_json file: resultJson.files){
+                ModifiedFiles.put(Utils_.toW(file.name), file.text);
+            }
+        }
+        //--
+        /*
         int codeIdx = runResult.indexOf(' ');
         if (codeIdx == -1) throw new PassException("Wrong input parameter");
         setErrorCode(Integer.parseInt(runResult.substring(0, codeIdx)));
@@ -545,13 +560,12 @@ public abstract class Sapfor extends OSDComponent {
                 }
                 codeIdx += count;
             }
+         */
     }
     //-
     public void Command(String request_in) throws Exception {
         setErrorCode(empty_code);
         outputMessage = output = result = predictorStats = "";
-        size = 0;
-        sizes = null;
         ModifiedFiles.clear();
         //модификации.-------------------------------------------------------------->>>>
         decodeString(Global.visualizer_2.Command(request_in).replace((char) 1, '\n'));
diff --git a/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java b/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java
index 9bc6ce90..b180e509 100644
--- a/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java
@@ -12,6 +12,7 @@ import java.io.PrintWriter;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.nio.file.Paths;
+import java.util.Date;
 public class Visualizer_2 extends OSDComponent {
     public String PID = "";
     //</editor-fold>
@@ -27,11 +28,15 @@ public class Visualizer_2 extends OSDComponent {
         port = port_in;
     }
     public static void UnpackVersionInfo(Component component, String packed) {
+        /*
         String[] data = packed.split("\\|");
         //лишний пробел.
         String text = data[0].substring(0, data[0].length() - 1);
         component.date_text = data[1] + data[2] + data[3];
         component.version = Long.parseLong(text);
+         */
+        component.version = 6666;
+        component.date_text = new Date().toString();
     }
     //<editor-fold desc="компонент">
     @Override
diff --git a/src/_VisualDVM/ProjectData/SapforData/ModifiedFile_json.java b/src/_VisualDVM/ProjectData/SapforData/ModifiedFile_json.java
new file mode 100644
index 00000000..31fe6ddf
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/ModifiedFile_json.java
@@ -0,0 +1,8 @@
+package _VisualDVM.ProjectData.SapforData;
+import com.google.gson.annotations.Expose;
+public class ModifiedFile_json {
+    @Expose
+    public String name;
+    @Expose
+    public String text;
+}
diff --git a/src/_VisualDVM/ProjectData/SapforData/SapforResult_json.java b/src/_VisualDVM/ProjectData/SapforData/SapforResult_json.java
index 1af3efc9..8eef26e6 100644
--- a/src/_VisualDVM/ProjectData/SapforData/SapforResult_json.java
+++ b/src/_VisualDVM/ProjectData/SapforData/SapforResult_json.java
@@ -1,12 +1,25 @@
 package _VisualDVM.ProjectData.SapforData;
 import com.google.gson.annotations.Expose;
+
+import java.util.List;
 public class SapforResult_json {
     @Expose
-    public int codeIdx;
+    public int errorCode;
     @Expose
     public String output;
     @Expose
     public String outputMessage;
     @Expose
     public String predictorStats;
+    @Expose
+    public List<ModifiedFile_json> files;
+    //--
+    public void Print(){
+        System.out.println("------------------------------");
+        System.out.println("codeIdx="+ errorCode);
+        System.out.println("output="+output);
+        System.out.println("outputMessage="+outputMessage);
+        System.out.println("predictorStats="+predictorStats);
+        System.out.println("-------------------------------");
+    }
 }