From 688f36c4c36e99a0a0ae8b0c2958eacea1349586 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 19 May 2025 14:37:14 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B0=D1=81=D0=BF=D0=B0=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D1=81=D1=81=D1=8B=D0=BB=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  4 +--
 properties                                    |  2 +-
 .../Passes/All/SPF_GetArrayLinks.java         | 36 +++++--------------
 3 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7729c471..6d1e13d5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,7 @@
   </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/Arrays/ArrayLinkJson.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayLinksJson.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_GetArrayLinks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetArrayLinks.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/properties b/properties
index d11c9dbd..5c3567d5 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1747139509\\test_routine_7",
+  "ProjectsSearchDirectory": "E:\\BUG",
   "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_GetArrayLinks.java b/src/_VisualDVM/Passes/All/SPF_GetArrayLinks.java
index 71bbc202..e8114487 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetArrayLinks.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetArrayLinks.java
@@ -2,6 +2,8 @@ package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Sapfor.SilentSapforPass;
+import _VisualDVM.ProjectData.SapforData.Arrays.ArrayLinkJson;
+import _VisualDVM.ProjectData.SapforData.Arrays.ArrayLinksJson;
 import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
 public class SPF_GetArrayLinks extends SilentSapforPass {
     @Override
@@ -21,35 +23,13 @@ public class SPF_GetArrayLinks extends SilentSapforPass {
          */
         //эту инфу суем в список объявленных массивов, чтобы не плодить лишних таблиц.
         System.out.println("packed="+ Utils_.Brackets(packed));
-        String[] data = packed.split("\\|");
-        long current_id;
-        int links_size = 0;
         ProjectArray current_array = null;
-        int j = 0;
-        for (int i = 0; i < data.length; ++i) {
-            switch (j) {
-                case 0:
-                    current_id = Long.parseLong(data[i]);
-                    current_array =
-                            target.declaratedArrays.get(current_id);
-                    current_array.links.clear();
-                    j++;
-                    break;
-                case 1:
-                    links_size = Integer.parseInt(data[i]);
-                    j++;
-                    break;
-                default:
-                    if (links_size > 0) {
-                        long link_id = Long.parseLong(data[i]);
-                        current_array.links.put(link_id, target.declaratedArrays.get(link_id));
-                        links_size--;
-                    }
-                    if (links_size == 0) {
-                        j = 0;
-                        current_array = null;
-                    }
-                    break;
+        ArrayLinksJson links = Utils_.gson.fromJson(packed, ArrayLinksJson.class);
+        for (ArrayLinkJson link: links.allLinks){
+            current_array = target.declaratedArrays.get(link.id);
+            current_array.links.clear();
+            for (long link_id: link.links){
+                current_array.links.put(link_id, target.declaratedArrays.get(link_id));
             }
         }
     }