From cba4425cd7651266ba295e71d8ad602589bc91a7 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 17 May 2025 18:07:07 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B8=D0=BD=D1=8B=D0=B9=20=D1=81=D1=82=D0=B8=D0=BB=D1=8C?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20=D0=BC=D0=B0=D1=81=D1=81?=
 =?UTF-8?q?=D0=B8=D0=B2=D0=BE=D0=B2=20=D0=B8=20=D1=80=D0=B5=D0=B3=D0=B8?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                              |  6 +++---
 properties                                       |  2 +-
 src/Common/Visual/UI.java                        |  2 --
 src/_VisualDVM/Constants.java                    |  2 +-
 .../Passes/All/SPF_GetAllDeclaratedArrays.java   |  3 ++-
 .../ProjectData/SapforData/Arrays/AlignRule.java | 16 ++++++++--------
 .../ProjectData/SapforData/Arrays/ArrayDecl.java | 10 +++++-----
 .../SapforData/Arrays/ProjectArray.java          |  6 +++---
 .../SapforData/Regions/ParallelRegion.java       | 16 ++++++++--------
 9 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 75be0abb..a082829f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,9 +9,9 @@
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <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/CombineFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CombineFiles.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" 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/Common/Visual/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index b5cc2074..5c3567d5 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1747072936\\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/Common/Visual/UI.java b/src/Common/Visual/UI.java
index 372f8698..00dfdd5c 100644
--- a/src/Common/Visual/UI.java
+++ b/src/Common/Visual/UI.java
@@ -59,12 +59,10 @@ public class UI {
         return Question(MainModule_.instance.getUI().getFrontWindow(), text);
     }
     public static void Info(String message) {
-        Utils_.CopyToClipboard(message);
         if (UI.isActive())
             JOptionPane.showMessageDialog(MainModule_.instance.getUI().getFrontWindow(), message, "", 1);
     }
     public static void Error(String message) {
-        Utils_.CopyToClipboard(message);
         if (UI.isActive())
             JOptionPane.showMessageDialog(MainModule_.instance.getUI().getFrontWindow(), message, "", 0);
     }
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 1c5f4b45..0e4be1bd 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1247;
+    public static final int version = 1248;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
diff --git a/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java b/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java
index bd2931bd..74f2357c 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java
@@ -1,6 +1,7 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Index;
 import Common.Utils.Utils_;
+import Common.Visual.UI;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -36,7 +37,7 @@ public class SPF_GetAllDeclaratedArrays extends SapforAnalysis {
         for (ProjectArray array: arraysJson.allArrays){
             array.Init();
             target.declaratedArrays.put(array.id, array);
-            array.print();
+          //  array.print();
         }
         for (DBProjectFile file : target.db.files.Data.values())
             file.ArrayGraphTitle = "Объявлений: " + file.array_decls.size();
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/AlignRule.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/AlignRule.java
index 9a3de105..c0db9f08 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/AlignRule.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/AlignRule.java
@@ -9,9 +9,9 @@ import java.math.BigInteger;
 import java.util.Vector;
 public class AlignRule {
     @Expose
-    public String packed_alignArray_address;
+    public String packedAlignArrayAddress;
     @Expose
-    public String packed_alignWith_address;
+    public String packedAlignWithAddress;
     @Expose
     public Vector<IntegerPairJson> alignRule;
     @Expose
@@ -41,13 +41,13 @@ public class AlignRule {
     }
     public void Init(){
         //--
-        if (packed_alignArray_address!=null)
-            alignArray_address = new BigInteger(packed_alignArray_address);
-        if (packed_alignWith_address!=null)
-            alignWith_address = new BigInteger(packed_alignWith_address);
+        if (packedAlignArrayAddress !=null)
+            alignArray_address = new BigInteger(packedAlignArrayAddress);
+        if (packedAlignWithAddress !=null)
+            alignWith_address = new BigInteger(packedAlignWithAddress);
         //--
-        packed_alignArray_address = null;
-        packed_alignWith_address = null;
+        packedAlignArrayAddress = null;
+        packedAlignWithAddress = null;
     }
     private static Pair<String, String> convertDigitToPositive(int digit) {
         String buf = "";
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java
index 2b85fa05..3be19780 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java
@@ -8,17 +8,17 @@ public class ArrayDecl extends FileObjectWithMessages {
     @Expose
     public String file = "";
     @Expose
-    public String array_name;
+    public String arrayName;
     @Expose
-    public int array_loc;
+    public int arrayLoc;
     //--
     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;
+        arrayName = array_name_in;
+        arrayLoc = array_loc_in;
     }
     @Override
     public String Description() {
-        return ArrayLocation.fromInt(array_loc).getDescription() + " массив " + Utils_.Brackets(array_name);
+        return ArrayLocation.fromInt(arrayLoc).getDescription() + " массив " + Utils_.Brackets(arrayName);
     }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
index fd15e9f1..43c3453f 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
@@ -24,7 +24,7 @@ public class ProjectArray extends DBObject {
     @Expose
     public long id;
     @Expose
-    public String packed_address;
+    public String packedAddress;
     @Expose
     public String name;
     @Expose
@@ -78,7 +78,7 @@ public class ProjectArray extends DBObject {
         Vector<String> res = new Vector<>();
         res.add(">");
         res.add("id=" + id);
-        res.add("packed_address=" + packed_address);
+        res.add("packed_address=" + packedAddress);
         res.add("name=" + name);
         res.add("shortName=" + shortName);
         res.add("dimSize=" + dimSize);
@@ -153,7 +153,7 @@ public class ProjectArray extends DBObject {
     public void Init() {
         //короткое имя+ функция/модуль/комон+ размерность
         UniqKey = shortName + locName + dimSize;
-        if (packed_address != null) address = new BigInteger(packed_address);
+        if (packedAddress != null) address = new BigInteger(packedAddress);
         for (ArrayDecl arrayDecl : declPlaces)
             arrayDecl.file = Utils_.toW(arrayDecl.file);
         //-- полей нет в json поэтому они null
diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java b/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java
index cbcc93dc..f3813a5b 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java
@@ -18,11 +18,11 @@ import java.util.Vector;
 public class ParallelRegion extends DBObject {
     //json
     @Expose
-    public String packed_region_id;
+    public String packedRegionId;
     @Expose
     public String originalName;
     @Expose
-    public List<ProjectArray> packed_arrays;
+    public List<ProjectArray> packedArrays;
     @Expose
     public List<FileRegionLinesJson> regionsLines;
     @Expose
@@ -125,9 +125,9 @@ public class ParallelRegion extends DBObject {
         lines = new LinkedHashMap<>();
         fragments = new Vector<>();
         //--
-        if (packed_region_id != null)
-            regionId = new BigInteger(packed_region_id);
-        for (ProjectArray array : packed_arrays) {
+        if (packedRegionId != null)
+            regionId = new BigInteger(packedRegionId);
+        for (ProjectArray array : packedArrays) {
             array.Init();//имена и адреса.
             arraysMap.put(array.address, array);
         }
@@ -139,9 +139,9 @@ public class ParallelRegion extends DBObject {
             }
         }
         //--
-        packed_region_id = null;
-        packed_arrays.clear();
-        packed_arrays = null;
+        packedRegionId = null;
+        packedArrays.clear();
+        packedArrays = null;
         regionsLines.clear();
         regionsLines = null;
         //--