From 1f5038724b63e7a0da5dcf58c2733922d4b7bf9a Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 5 Nov 2023 23:21:53 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |   9 ++---
 .../SapforTasksPackageInterface.java          |   9 ++---
 .../UI/ConfigurationDescription.java          |  25 --------------
 .../UI/ConfigurationSummary.java              |  31 ++++++++++++++++++
 .../SapforTasksPackage/UI/StateSummary.java   |  11 ++++---
 src/icons/versions/Configuration.png          | Bin 0 -> 861 bytes
 6 files changed, 45 insertions(+), 40 deletions(-)
 delete mode 100644 src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationDescription.java
 create mode 100644 src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java
 create mode 100644 src/icons/versions/Configuration.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fa31b75f..984b2b1e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/icons/versions/DoneStateSummary.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/icons/versions/ErrorsStateSummary.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/icons/versions/UnknownStateSummary.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/versions/Configuration.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/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.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/UI/SapforVersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationDescription.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.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 06742e52..ac1bd55a 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
@@ -5,7 +5,7 @@ import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
 import SapforTestingSystem.Json.SapforTasksResults_json;
 import SapforTestingSystem.SapforTask.SapforTask;
-import SapforTestingSystem.SapforTasksPackage.UI.ConfigurationDescription;
+import SapforTestingSystem.SapforTasksPackage.UI.ConfigurationSummary;
 import SapforTestingSystem.SapforTasksPackage.UI.StateSummary;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -51,7 +51,8 @@ public class SapforTasksPackageInterface {
             LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = sortedTasks.get(state);
             for (String configuration_id : tasksByConfigurations.keySet()) {
                 //--
-                DefaultMutableTreeNode configurationNode = null;
+                ConfigurationSummary configurationSummary = new ConfigurationSummary();
+                DefaultMutableTreeNode configurationNode = new DefaultMutableTreeNode(configurationSummary);
                 //--
                 LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
                 for (String group : groups_tasks.keySet()) {
@@ -60,8 +61,8 @@ public class SapforTasksPackageInterface {
                         //--
                         stateSummary.count++;
                         //--
-                        if (configurationNode == null)
-                            configurationNode = new DefaultMutableTreeNode(new ConfigurationDescription(configuration_id, task));
+                        if (configurationSummary.text.isEmpty())
+                            configurationSummary.init(configuration_id, task);
                         //--
                         groupNode.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id)));
                     }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationDescription.java b/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationDescription.java
deleted file mode 100644
index 7e8a8065..00000000
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationDescription.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
-import Common.Utils.Utils;
-import SapforTestingSystem.SapforTask.SapforTask;
-import Visual_DVM_2021.Passes.PassCode_2021;
-
-import java.util.Arrays;
-import java.util.Vector;
-public class ConfigurationDescription {
-    public String id = "";
-    public String text = "";
-    public ConfigurationDescription(String configuration_id, SapforTask task) {
-        id = configuration_id;
-        text = task.flags;
-        Vector<String> codes = new Vector<>(Arrays.asList(task.codes.split(" ")));
-        Vector<String> descriptions = new Vector<>();
-        for (int i = 1; i < codes.size(); ++i) {
-            descriptions.add(Utils.Brackets(PassCode_2021.valueOf(codes.get(i)).getDescription()));
-        }
-        text += " " + String.join("→", descriptions);
-    }
-    @Override
-    public String toString() {
-        return text;
-    }
-}
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java b/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java
new file mode 100644
index 00000000..ad72e2a3
--- /dev/null
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java
@@ -0,0 +1,31 @@
+package SapforTestingSystem.SapforTasksPackage.UI;
+import Common.Utils.Utils;
+import SapforTestingSystem.SapforTask.SapforTask;
+import Visual_DVM_2021.Passes.PassCode_2021;
+
+import java.util.Arrays;
+import java.util.Vector;
+public class ConfigurationSummary extends TreeSummary {
+    public String configuration_id = "";
+    public String flags = "";
+    public Vector<String> codes_descriptions = new Vector<>();
+    public ConfigurationSummary() {
+    }
+    public void init(String configuration_id_in, SapforTask task) {
+        configuration_id = configuration_id_in;
+        flags = task.flags;
+        Vector<String> codes_s = new Vector<>(Arrays.asList(task.codes.split(" ")));
+        for (int i = 1; i < codes_s.size(); ++i) {
+            codes_descriptions.add(Utils.Brackets(PassCode_2021.valueOf(codes_s.get(i)).getDescription()));
+        }
+        refreshText();
+    }
+    @Override
+    public void refreshText() {
+        text = flags + " " + String.join("→", codes_descriptions);
+    }
+    @Override
+    public String getImageKey() {
+        return "Configuration";
+    }
+}
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java b/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java
index 1db5cf9e..57792617 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java
@@ -1,18 +1,19 @@
 package SapforTestingSystem.SapforTasksPackage.UI;
 import GlobalData.Tasks.TaskState;
-public class StateSummary extends TreeSummary{
+public class StateSummary extends TreeSummary {
     public TaskState state;
     public int count = 0;
-    public StateSummary(TaskState state_in){
+    public StateSummary(TaskState state_in) {
         state = state_in;
+        refreshText();
     }
     @Override
-    public void refreshText(){
-        text = state.getDescription()+" : "+count;
+    public void refreshText() {
+        text = state.getDescription() + " : " + count;
     }
     @Override
     public String getImageKey() {
-        switch (state){
+        switch (state) {
             case Done:
                 return "DoneStateSummary";
             case DoneWithErrors:
diff --git a/src/icons/versions/Configuration.png b/src/icons/versions/Configuration.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a681b9feab52409a3c20165c442be1bb67225e9
GIT binary patch
literal 861
zcmV-j1ETziP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ;<4Ht8RCwBClg(?CR}{vdbMJj;-uIo!*hwZc9W#lOWYpLM3Q1{-A_^+hMG-`I
z;=;BIQ4mq^KXBPa7jFCm+Et;Oc2UG-V_T4P)hgl#_?ejbe!uQ}?{P6RYV?7JvpT<f
z&$-W~qel-D0Ho60rA+v!lihjAO*^-gjh_Qx!MX_$0bmS7cqdi>SXzyyKYKNi?m|l0
z)zB%PVIgzH;Ne*}3IDMq`Mo9(2p}Q=kTZ>idNWtQp2*zc)G4eg*UPZ-b{b2QhBBp8
z`BOdzYeEQ&Y^(u5OhlxV2_L7z{XBK@pLxX+l<Nb`h+CWJcG8n)PknQIxju0^h!O$-
z$8m7yueG(?fBbrd*;-jzJa9QwJ5DIq&$)#nCM!h<A&_Vb6Lit;1<uOSzUfANrdB9?
zQY(&+*Ak<?iW6Jgc=6;n*_fS9VwK--l~;58JcJO?I)x4cM7=hStSn-0Z4#|k3!QEk
z{UAU-=b=)aUe1q=c}m*&F@!4EBu3ocM4H3^Tg06$7-Jzwz|Usz@Z~EI5rhz!sZF6$
zF2fP}OF26~?`BN@jwMwNt=eP5E|Pu^aTMX=$zxbvsKb#0-ClpRcx-NMAqYbxad1!0
z&rL^}G<c$wU-fnKXALzoF8V*MF6}KGTv;mTB=Ge4%V88ScnK-sxh`}ZK2QLW6^aVc
zvmXQ-sJQv(nA8uxJ$~*`sXT#ZtBqaN2`~hDaf(i-JB-u-sNT<qWeepM+pijDe!Tf#
zb<TT~1-J~&gvFA<{z_{Ac$cW{0Agc}_i3Y3{rdc^r#)E1AOZqS=*=ZKP_ba<w+3$q
z3}vk_5wgO9hpD#=IAYK+TI8sH3}9;jPNjeveIF$T1~52zSm}ciz#=PD`~LdW-D_Wb
z_x*+6OB1DPYEm#03Rwooh3EMI7@p@rM;UMX4TvCZ6!FI0_1FL3zA?Ug-$A1_K){v-
nHb78P0sz9E#=q--|MF%4tMfz0idC_P00000NkvXXu0mjfi_v=0

literal 0
HcmV?d00001