From b4070b41cb3ff515272ed7966fb14ee354c69049 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 2 Nov 2023 23:42:53 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  2 --
 .../SapforTasksPackageInterface.java          | 23 +++++--------------
 .../{ => UI}/SapforTasksPackageTree.java      |  2 +-
 .../UI/Main/SapforPackagesComparisonForm.java |  2 +-
 4 files changed, 8 insertions(+), 21 deletions(-)
 rename src/SapforTestingSystem/SapforTasksPackage/{ => UI}/SapforTasksPackageTree.java (96%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 83030752..4d61cbe5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,6 @@
   <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/SapforTestingSystem/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
index d0dff80b..b7dcfb75 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
@@ -14,6 +14,11 @@ public class SapforTasksPackageInterface {
     public static File getPackageArchive(SapforTasksPackage package_in) {
         return new File(Global.SapforPackagesDirectory, package_in.id + ".zip");
     }
+    /*
+    getTaskConfigurationDescription(SapforTask task){
+
+    }
+     */
     public static DefaultMutableTreeNode getTreeRoot(SapforTasksPackage package_in) {
 
         SapforTasksResults_json results_json = getLocalResults(package_in);
@@ -21,37 +26,21 @@ public class SapforTasksPackageInterface {
         LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = results_json.sortTasksByConfigurationsAndGroups();
         //--
         DefaultMutableTreeNode root = new DefaultMutableTreeNode(package_in.id);
-        //  DefaultMutableTreeNode configurationsTitleNode = new DefaultMutableTreeNode("Конфигурации");
-        //  root.add(configurationsTitleNode);
         for (String configuration_id : tasksByConfigurations.keySet()) {
             DefaultMutableTreeNode configurationNode = new DefaultMutableTreeNode(configuration_id);
-            // DefaultMutableTreeNode groupsTitleNode = new DefaultMutableTreeNode("Группы тестов");
-            //  Vector<DefaultMutableTreeNode> configurationDescription = null;
             LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
             for (String group : groups_tasks.keySet()) {
                 DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(group);
                 for (SapforTask task : groups_tasks.get(group)) {
-                    /*
-                    if (configurationDescription == null)
-                        configurationDescription = getTaskConfigurationDescription(task);
-                     */
+
                     DefaultMutableTreeNode taskNode = new DefaultMutableTreeNode(task.test_description);
                     //--
                     taskNode.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id)));
                     //--
                     groupNode.add(taskNode);
                 }
-                /*
-                if (configurationDescription != null) {
-                    for (DefaultMutableTreeNode node : configurationDescription)
-                        configurationNode.add(node);
-                }
-                 */
-                //  groupsTitleNode.add(groupNode);
                 configurationNode.add(groupNode);
             }
-            //  configurationNode.add(groupsTitleNode);
-            //   configurationsTitleNode.add(configurationNode);
             root.add(configurationNode);
         }
         return root;
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java b/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java
similarity index 96%
rename from src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
rename to src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java
index 948439b1..b9933b9e 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTasksPackage;
+package SapforTestingSystem.SapforTasksPackage.UI;
 import Common.Current;
 import Common.UI.Trees.DataTree;
 import Common.UI.UI;
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index 13c131cc..a2144cdc 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -7,7 +7,7 @@ import Common.UI.UI;
 import Common.Utils.TextLog;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageTree;
+import SapforTestingSystem.SapforTasksPackage.UI.SapforTasksPackageTree;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;