From 98ec37233ada2ccd82aacf0421c176f2d5fa0a70 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 3 Apr 2025 16:08:36 +0300
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=B1=D0=B0=D0=B3?=
 =?UTF-8?q?=D0=B0=20=D1=81=20=D1=80=D0=B0=D1=81=D0=BF=D0=B0=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=BE=D0=B9=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B9=20=D0=BF=D1=80=D0=B8=20=D0=B2=D1=8B=D0=B3?=
 =?UTF-8?q?=D1=80=D1=83=D0=B7=D0=BA=D0=B5=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8?=
 =?UTF-8?q?=D0=B9=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=81=D0=B0=D0=BF=D1=84=D0=BE=D1=80=20?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=BA=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  9 ++++++++-
 properties                                    |  2 +-
 .../ProjectData/Messages/Message.java         |  6 +++++-
 .../SAPFOR/Json/SapforPackage_json.java       |  2 ++
 .../SAPFOR/Json/SapforVersion_json.java       |  2 ++
 .../Windows/SapforPackagesComparisonForm.java | 20 ++++++++++++++++++-
 6 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a57030eb..80b0560b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,14 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="" />
+    <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/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/properties b/properties
index 9e5898b8..0920b1b7 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\SAPFOR\\Tests\\BT_inserted",
+  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\chart_1743685354",
   "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/ProjectData/Messages/Message.java b/src/_VisualDVM/ProjectData/Messages/Message.java
index 464c0674..74249d73 100644
--- a/src/_VisualDVM/ProjectData/Messages/Message.java
+++ b/src/_VisualDVM/ProjectData/Messages/Message.java
@@ -37,7 +37,11 @@ public class Message extends iDBObject {
                 (Global.mode != Mode.Normal)) {
             value = value_in;
         } else {
-            value = !Global.mainModule.getProject().sapforProperties.TRANSLATE_MESSAGES ? value_in : decodeRussianMessage(value_in);
+            if (Global.mainModule.HasProject()) {
+                value = !Global.mainModule.getProject().sapforProperties.TRANSLATE_MESSAGES ? value_in : decodeRussianMessage(value_in);
+            }else {
+                value = decodeRussianMessage(value_in);
+            }
         }
     }
     // last code - 183
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java
index 35eee81c..e76f6dee 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java
@@ -178,6 +178,8 @@ public class SapforPackage_json implements Serializable {
         return comparison_root.mismatches_count;
     }
     public void getVersionsFiles(SapforPackage package_in) {
+        //---
+        //---
         for (SapforTask task : tasks) {
             File configurationRoot = Paths.get(
                     package_in.getLocalWorkspace().getAbsolutePath(),
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java
index c98e8118..313eb15d 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java
@@ -70,6 +70,7 @@ public class SapforVersion_json implements Serializable {
                     }
                 }
             }
+
             if (!files.isEmpty())
                 state = SapforVersionState.Normal;
         }
@@ -83,6 +84,7 @@ public class SapforVersion_json implements Serializable {
         out_files.add(parse_err.file);
         out_files.add(out.file);
         out_files.add(err.file);
+
         for (File file : out_files) {
             try {
                 if (file.exists()) {
diff --git a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
index 375de5a0..cd39a969 100644
--- a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
@@ -2,6 +2,7 @@ package _VisualDVM.Visual.Windows;
 import Common.Database.Objects.DBObject;
 import Common.Passes.Pass;
 import Common.Utils.TextLog;
+import Common.Utils.Utils_;
 import Common.Visual.Controls.ShortLabel;
 import Common.Visual.Menus.VisualiserMenuBar;
 import Common.Visual.UI;
@@ -13,6 +14,7 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTasksPackageTree;
 
 import javax.swing.*;
+import java.util.concurrent.ForkJoinPool;
 public class SapforPackagesComparisonForm {
     public boolean comparisonMode = false;
     public JScrollPane treeScroll = null;
@@ -151,9 +153,13 @@ public class SapforPackagesComparisonForm {
         //--
         if (object.package_json == null) {
             try {
+                System.out.println(object.getPK()+" reading json");
                 object.readJson();
+                System.out.println("done");
+                System.out.println(object.getPK()+" reading files");
                 object.package_json.getVersionsFiles(object);
                 object.package_json.buildTree(object);
+                System.out.println(object.getPK()+" done");
                 //---
             } catch (Exception ex) {
                 ex.printStackTrace();
@@ -206,7 +212,6 @@ public class SapforPackagesComparisonForm {
                         Log.Writeln_("Количество задач в пакетах не совпадает!");
                         return false;
                     }
-                    //--
                     //todo  в дереве отображать пустые задачи заместо тех кого не хватает.
                     for (SapforTask task1 : package1.package_json.tasks) {
                         if (!package2.package_json.containsKey(task1.getUniqueKey()))
@@ -238,10 +243,23 @@ public class SapforPackagesComparisonForm {
             @Override
             protected void body() throws Exception {
                 //теперь сравниваем задачи
+                System.out.println("serial comparison");
                 for (SapforTask task1 : package1.package_json.tasks) {
                     SapforTask task2 = package2.package_json.getTaskByKey(task1.getUniqueKey());
                     task1.checkMatch(task2);
                 }
+                System.out.println("DONE");
+                /*
+                ForkJoinPool commonPool = ForkJoinPool.commonPool();
+                System.out.println("parallel comparison");
+                commonPool.submit(() ->
+                        package1.package_json.tasks.parallelStream()
+                                .forEach(task1 -> {
+                                    SapforTask task2 = package2.package_json.getTaskByKey(task1.getUniqueKey());
+                                    task1.checkMatch(task2);
+                                })
+                ).join();
+                 */
                 package1.package_json.buildComparisonTree(package1);
                 package2.package_json.buildComparisonTree(package2);
             }