From 6f61c835b5ed2c5ec68dfb4516a09db0dbdd4c2a Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 3 Nov 2023 02:33:19 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  9 +---
 src/GlobalData/Tasks/TaskState.java           |  2 +-
 .../SapforTasksPackageInterface.java          | 42 ++++++++++++-------
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5807e386..79721966 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/icons/versions/BadVersion.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Trees/TreeRenderers.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Trees/TreeRenderers.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Project/UI/PackageVersionsTree.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Project/UI/PackageVersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java" 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/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/GlobalData/Tasks/TaskState.java b/src/GlobalData/Tasks/TaskState.java
index 2e9717f7..840eec0b 100644
--- a/src/GlobalData/Tasks/TaskState.java
+++ b/src/GlobalData/Tasks/TaskState.java
@@ -17,13 +17,13 @@ public enum TaskState implements StatusEnum {
     //-----------------------
     Finished,
     //--- результирующие
-    Done,
     DoneWithErrors,
     AbortedByTimeout,
     AbortedByUser,
     Crushed,
     WrongTestFormat,
     InternalError,
+    Done,
     //--- сугубо кластерные.
     Queued,
     NoSuchTask,
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
index e72232b3..b9cb97e6 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
@@ -2,6 +2,7 @@ package SapforTestingSystem.SapforTasksPackage;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
+import GlobalData.Tasks.TaskState;
 import SapforTestingSystem.Json.SapforTasksResults_json;
 import SapforTestingSystem.SapforTask.SapforTask;
 import SapforTestingSystem.SapforTasksPackage.UI.ConfigurationDescription;
@@ -18,26 +19,37 @@ public class SapforTasksPackageInterface {
     public static DefaultMutableTreeNode getTreeRoot(SapforTasksPackage package_in) {
         SapforTasksResults_json results_json = getLocalResults(package_in);
         //--  флаги                 группы
-        LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = results_json.sortTasksByConfigurationsAndGroups();
+        LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = results_json.sortTasksByStatesConfigurationsAndGroups();
         //--
         DefaultMutableTreeNode root = new DefaultMutableTreeNode(package_in.id);
-        for (String configuration_id : tasksByConfigurations.keySet()) {
+        for (TaskState state : sortedTasks.keySet()) {
+            int count = 0;
             //--
-            DefaultMutableTreeNode configurationNode = 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 (configurationNode == null)
-                        configurationNode = new DefaultMutableTreeNode(new ConfigurationDescription(configuration_id, task));
-                    //--
-                    groupNode.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id)));
+            DefaultMutableTreeNode stateNode = new DefaultMutableTreeNode(state.getDescription());
+            LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = sortedTasks.get(state);
+            for (String configuration_id : tasksByConfigurations.keySet()) {
+                //--
+                DefaultMutableTreeNode configurationNode = 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)) {
+                        count++;
+                        //--
+                        if (configurationNode == null)
+                            configurationNode = new DefaultMutableTreeNode(new ConfigurationDescription(configuration_id, task));
+                        //--
+                        groupNode.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id)));
+                    }
+                    configurationNode.add(groupNode);
                 }
-                configurationNode.add(groupNode);
+                stateNode.add(configurationNode);
+            }
+            if (stateNode.getChildCount() > 0) {
+                stateNode.setUserObject(state.getDescription() + ": " + count);
+                root.add(stateNode);
             }
-            root.add(configurationNode);
         }
         return root;
     }