From 0370573269d064acf91fff108def5ece890c5a99 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 25 Dec 2023 17:55:15 +0300
Subject: [PATCH] =?UTF-8?q?fix=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                             |  4 ++--
 .../SAPFOR/Json/SapforPackage_json.java         | 17 +++++++++++++----
 src/TestingSystem/SAPFOR/PerformSapforTask.java |  4 ++--
 .../SAPFOR/SapforTask/SapforTask.java           |  1 +
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 206fe38d..bf79b2d1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,9 +8,9 @@
   <component name="ChangeListManager">
     <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$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java b/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
index 2a7b09f9..31b38475 100644
--- a/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
@@ -7,8 +7,8 @@ import TestingSystem.SAPFOR.SapforTasksPackage.UI.*;
 import com.google.gson.annotations.Expose;
 
 import javax.swing.tree.DefaultMutableTreeNode;
-import java.io.File;
 import java.io.Serializable;
+import java.nio.file.Paths;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -21,7 +21,7 @@ public class SapforPackage_json implements Serializable {
     //--
     @Expose
     public int max_set_id = 0;
-    public int getMaxSetId(){
+    public int getMaxSetId() {
         return max_set_id++;
     }
     //--
@@ -133,6 +133,7 @@ public class SapforPackage_json implements Serializable {
             }
         }
     }
+    //---------------------------------------------------->>
     public void buildTree(SapforPackage package_in) {
         root = new PackageSummary();
         //---
@@ -159,7 +160,11 @@ public class SapforPackage_json implements Serializable {
                             configurationNode = new ConfigurationSummary(configuration_id, task);
                         }
                         //--
-                        groupSummary.add(task.getVersionsTree(new File(package_in.getLocalWorkspace(), String.valueOf(configuration_id))));
+                        groupSummary.add(task.getVersionsTree(
+                                Paths.get(package_in.getLocalWorkspace().getAbsolutePath(),
+                                        String.valueOf(task.set_id),
+                                        String.valueOf(configuration_id)).toFile())
+                        );
                     }
                     if (configurationNode != null)
                         configurationNode.add(groupSummary);
@@ -203,7 +208,11 @@ public class SapforPackage_json implements Serializable {
                                 configurationNode = new ConfigurationSummary(configuration_id, task);
                             }
                             //--
-                            groupSummary.add(task.getVersionsTree(new File(package_in.getLocalWorkspace(), String.valueOf(configuration_id))));
+                            groupSummary.add(task.getVersionsTree(
+                                    Paths.get(package_in.getLocalWorkspace().getAbsolutePath(),
+                                            String.valueOf(task.set_id),
+                                            String.valueOf(configuration_id)).toFile())
+                            );
                         }
                         if (configurationNode != null)
                             configurationNode.add(groupSummary);
diff --git a/src/TestingSystem/SAPFOR/PerformSapforTask.java b/src/TestingSystem/SAPFOR/PerformSapforTask.java
index 6d77d1e9..b4cef0e2 100644
--- a/src/TestingSystem/SAPFOR/PerformSapforTask.java
+++ b/src/TestingSystem/SAPFOR/PerformSapforTask.java
@@ -49,7 +49,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
                 String.valueOf(set_json.id),
                 String.valueOf(configuration_json.id),
                 target.test_description).toFile();
-        root = new File(Global.Home, String.valueOf(configuration_json.id));
+        root = Paths.get(Global.Home, String.valueOf(set_json.id), String.valueOf(configuration_json.id)).toFile();
         task = null;
         //--->>
         return true;
@@ -114,7 +114,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
     @Override
     protected void body() throws Exception {
         target.StartDate = new Date().getTime();
-        target.versions.add(version_json = new SapforVersion_json(target.test_description, ""));
+        target.versions.add(version_json = new SapforVersion_json(target.test_description, "исходная"));
         for (PassCode_2021 code : configuration_json.codes) {
             if (parse()) {
                 if (code.equals(PassCode_2021.CreateParallelVariants))
diff --git a/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java b/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
index 5d0c9dbf..a6b19497 100644
--- a/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
+++ b/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
@@ -77,6 +77,7 @@ public class SapforTask extends DBObject {
         //--
         for (SapforVersion_json version_json : versions) {
             version_json.task = this;
+           // System.out.println(version_json.version);
             //-
             child = new VersionSummary(version_json, version_json.init(configurationRoot));
             if (parent == null) {