From 62a45fd8bec5ce7c06f2daccbf26591e5a3bf225 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 6 May 2025 17:28:46 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                                 |  9 +--------
 .../ProjectData/SapforData/Arrays/ArrayDecl.java    |  7 ++++---
 .../ProjectData/SapforData/Arrays/ProjectArray.java | 13 +++++--------
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2548a84d..e0cebb97 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,16 +7,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Common/Utils/IntegerPairJson.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/MassSelectArrays.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/MassSelectArrays.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/DBArray.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/DBArray.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/Distribution/DataDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/Distribution/DataDirective.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java
index f2617928..2b85d6dc 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java
@@ -8,14 +8,15 @@ public class ArrayDecl extends FileObjectWithMessages {
     @Expose
     public String array_name;
     @Expose
-    public ArrayLocation array_loc;
-    public ArrayDecl(String array_name_in, ArrayLocation array_loc_in, DBProjectFile father_in, int lineNum_in) {
+    public int array_loc;
+    //--
+    public ArrayDecl(String array_name_in, int array_loc_in, DBProjectFile father_in, int lineNum_in) {
         super(father_in, lineNum_in);
         array_name = array_name_in;
         array_loc = array_loc_in;
     }
     @Override
     public String Description() {
-        return array_loc.getDescription() + " массив " + Utils_.Brackets(array_name);
+        return ArrayLocation.fromInt(array_loc).getDescription() + " массив " + Utils_.Brackets(array_name);
     }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
index 18c4cae5..2740b53e 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
@@ -22,9 +22,6 @@ import java.util.List;
 import java.util.Vector;
 import java.util.stream.Collectors;
 public class ProjectArray extends DBObject {
-    //----------------------------------------------------------------------
-    public static final String[] alignNames = {"i", "j", "k", "l", "m", "n", "q", "r", "s", "t", "u", "w", "x", "y", "z"};
-    //json-------------------
     @Expose
     public long id;
     @Expose
@@ -47,7 +44,6 @@ public class ProjectArray extends DBObject {
     public int isLoopArrayFlag;
     @Expose
     Vector<ArrayDecl> declPlaces = new Vector<>();
-    //--шаблон---
     @Expose
     List<Integer> deprecateToDist = new Vector<>();
     @Expose
@@ -56,9 +52,10 @@ public class ProjectArray extends DBObject {
     Vector<IntegerPairJson> sizes = new Vector<>();
     @Expose
     Vector<String> regions = new Vector<>();
-
-   // LinkedHashMap<BigInteger, TemplateLink> templateInfo = new LinkedHashMap<>();
-    //---
+    //--
+    //----------------------------------------------------------------------
+    public static final String[] alignNames = {"i", "j", "k", "l", "m", "n", "q", "r", "s", "t", "u", "w", "x", "y", "z"};
+    //json-------------------
     public String UniqKey;
     public BigInteger address;
 
@@ -135,7 +132,7 @@ public class ProjectArray extends DBObject {
             DBProjectFile file = Global.mainModule.getProject().db.files.Data.get(declFile);
             int declLine = Integer.parseInt(localSplited[idxPl + 1]);
             //declPlaces.add(new Pair<>(declFile, declLine));
-            ArrayDecl decl = new ArrayDecl(shortName, getLocation(), file, declLine);
+            ArrayDecl decl = new ArrayDecl(shortName, location, file, declLine);
             declPlaces.add(decl);
             file.array_decls.add(decl); //++
         }