фикс бага с распаковкой сообщений при выгрузке версий тестирования сапфор как проекта

.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" />

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",

src/_VisualDVM/ProjectData/Messages/Message.java

@@ -37,7 +37,11 @@ public class Message extends iDBObject {
                 (Global.mode != Mode.Normal)) {
             value = value_in;
         } else {
+            if (Global.mainModule.HasProject()) {
                 value = !Global.mainModule.getProject().sapforProperties.TRANSLATE_MESSAGES ? value_in : decodeRussianMessage(value_in);
+            }else {
+                value = decodeRussianMessage(value_in);
+            }
         }
     }
     // last code - 183

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(),

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()) {

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);
             }