From e8c748eb7e7856329db97140255be2b902a3691b Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 16 Apr 2025 14:45:34 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=B5=D1=82=D1=80=D0=B8=D0=BA=D0=B0=20js?=
 =?UTF-8?q?on?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  4 ++-
 .../Passes/All/SPF_GetFileLineInfo.java       | 29 +++++++++----------
 .../SapforData/LineInfo/FileMetrics.java      | 12 ++++++++
 .../SapforData/LineInfo/MetricsJson.java      |  9 ++++++
 4 files changed, 37 insertions(+), 17 deletions(-)
 create mode 100644 src/_VisualDVM/ProjectData/SapforData/LineInfo/FileMetrics.java
 create mode 100644 src/_VisualDVM/ProjectData/SapforData/LineInfo/MetricsJson.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 96fedf39..943a1e40 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,10 @@
   </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/LineInfo/FileMetrics.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/LineInfo/MetricsJson.java" 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/Passes/All/SPF_InsertIncludesPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java b/src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java
index cfae4562..6ff1987d 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java
@@ -3,6 +3,8 @@ import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
+import _VisualDVM.ProjectData.SapforData.LineInfo.FileMetrics;
+import _VisualDVM.ProjectData.SapforData.LineInfo.MetricsJson;
 public class SPF_GetFileLineInfo extends SapforAnalysis {
     @Override
     public String phase() {
@@ -21,22 +23,17 @@ public class SPF_GetFileLineInfo extends SapforAnalysis {
     }
     @Override
     protected void unpack(String packed) throws Exception {
-        //----------------------------------------
-        String[] data_ = packed.split("@");
-        DBProjectFile file_ = null;
-        for (int i = 0; i < data_.length; ++i) {
-            String s = data_[i];
-            if (i % 2 == 0) {
-                file_ = target.db.files.Data.get(Utils_.toW(s));
-            } else {
-                String[] local = s.split("_");
-                int num = Integer.parseInt(local[0]);
-                target.numSPF += Integer.parseInt(local[1]);
-                target.numDVM += Integer.parseInt(local[2]);
-                if (file_ != null)
-                    file_.lines_count = num;
-                target.numLines += num;
-            }
+        MetricsJson metricsJson = Utils_.gson.fromJson(packed, MetricsJson.class);
+        for (FileMetrics fileMetrics : metricsJson.allMetrics) {
+            fileMetrics.file = Utils_.toW(fileMetrics.file);
+            //--
+            DBProjectFile file = target.db.files.Data.get(fileMetrics.file);
+            file.lines_count = fileMetrics.linesCount;
+            //--
+            target.numLines+= fileMetrics.linesCount;
+            target.numSPF += fileMetrics.numSPF;
+            target.numDVM += fileMetrics.numDVM;
+            //--
         }
         target.UpdateDVMCount();
         target.UpdateSPFCount();
diff --git a/src/_VisualDVM/ProjectData/SapforData/LineInfo/FileMetrics.java b/src/_VisualDVM/ProjectData/SapforData/LineInfo/FileMetrics.java
new file mode 100644
index 00000000..638b078a
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/LineInfo/FileMetrics.java
@@ -0,0 +1,12 @@
+package _VisualDVM.ProjectData.SapforData.LineInfo;
+import com.google.gson.annotations.Expose;
+public class FileMetrics {
+    @Expose
+    public String file;
+    @Expose
+    public int linesCount;
+    @Expose
+    public int numSPF;
+    @Expose
+    public int numDVM;
+}
diff --git a/src/_VisualDVM/ProjectData/SapforData/LineInfo/MetricsJson.java b/src/_VisualDVM/ProjectData/SapforData/LineInfo/MetricsJson.java
new file mode 100644
index 00000000..62066283
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/LineInfo/MetricsJson.java
@@ -0,0 +1,9 @@
+package _VisualDVM.ProjectData.SapforData.LineInfo;
+import com.google.gson.annotations.Expose;
+
+import java.util.List;
+import java.util.Vector;
+public class MetricsJson {
+    @Expose
+    public List<FileMetrics> allMetrics = new Vector<>();
+}