From 51f67594c25357653c8f381f8f053f7f5e14fd32 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 6 Nov 2023 20:12:05 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                            |   7 +++----
 .../SapforTasksPackageInterface.java           |   7 ++++++-
 .../SapforTasksPackage/UI/GroupSummary.java    |  13 +++++++++++++
 .../UI/SapforVersionsTreeCellRenderer.java     |  17 ++++++++++-------
 src/icons/versions/Group.png                   | Bin 0 -> 968 bytes
 src/icons/versions/TestVersion.png             | Bin 0 -> 829 bytes
 6 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 src/SapforTestingSystem/SapforTasksPackage/UI/GroupSummary.java
 create mode 100644 src/icons/versions/Group.png
 create mode 100644 src/icons/versions/TestVersion.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 984b2b1e..59817749 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,12 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/icons/versions/Configuration.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/TestVersionSummary.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/versions/TestVersion.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/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" 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/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" />
     </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 ac1bd55a..8cb6e692 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
@@ -6,6 +6,7 @@ import GlobalData.Tasks.TaskState;
 import SapforTestingSystem.Json.SapforTasksResults_json;
 import SapforTestingSystem.SapforTask.SapforTask;
 import SapforTestingSystem.SapforTasksPackage.UI.ConfigurationSummary;
+import SapforTestingSystem.SapforTasksPackage.UI.GroupSummary;
 import SapforTestingSystem.SapforTasksPackage.UI.StateSummary;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -56,7 +57,10 @@ public class SapforTasksPackageInterface {
                 //--
                 LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
                 for (String group : groups_tasks.keySet()) {
-                    DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(group);
+                    //--
+                    GroupSummary groupSummary = new GroupSummary(group);
+                    DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(groupSummary);
+                    //--
                     for (SapforTask task : groups_tasks.get(group)) {
                         //--
                         stateSummary.count++;
@@ -65,6 +69,7 @@ public class SapforTasksPackageInterface {
                             configurationSummary.init(configuration_id, task);
                         //--
                         groupNode.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id)));
+
                     }
                     configurationNode.add(groupNode);
                 }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/GroupSummary.java b/src/SapforTestingSystem/SapforTasksPackage/UI/GroupSummary.java
new file mode 100644
index 00000000..0aa91951
--- /dev/null
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/GroupSummary.java
@@ -0,0 +1,13 @@
+package SapforTestingSystem.SapforTasksPackage.UI;
+public class GroupSummary extends TreeSummary {
+    @Override
+    public void refreshText() {
+    }
+    @Override
+    public String getImageKey() {
+        return "Group";
+    }
+    public GroupSummary(String group_name) {
+        text = group_name;
+    }
+}
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java b/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
index fe32a86e..105af8cc 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
@@ -1,8 +1,10 @@
 package SapforTestingSystem.SapforTasksPackage.UI;
 import Common.UI.Trees.StyledTreeCellRenderer;
+import SapforTestingSystem.Json.SapforVersion_json;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
+import java.util.Objects;
 public class SapforVersionsTreeCellRenderer extends StyledTreeCellRenderer {
     public java.awt.Component getTreeCellRendererComponent(
             JTree tree, Object value,
@@ -16,14 +18,15 @@ public class SapforVersionsTreeCellRenderer extends StyledTreeCellRenderer {
             setFont(getFont().deriveFont((float) 14.0));
             setIcon(summary.getIcon());
         }
-        /*
-        else
-
-        {
-            setForeground(tree.getForeground());
-            setFont(getFont().deriveFont((float) 14.0));
+        else {
+            if (o instanceof SapforVersion_json){
+                SapforVersion_json version_json = (SapforVersion_json) o;
+                setForeground(tree.getForeground());
+                setFont(getFont().deriveFont((float) 14.0));
+                setIcon(new ImageIcon(Objects.requireNonNull(getClass().getResource("/icons/versions/TestVersion.png"))));
+                setText(version_json.toString());
+            }
         }
-         */
         return this;
     }
 }
diff --git a/src/icons/versions/Group.png b/src/icons/versions/Group.png
new file mode 100644
index 0000000000000000000000000000000000000000..33f959946587249b786c364121423543d1e17f4a
GIT binary patch
literal 968
zcmV;(12_DMP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000tn
z000tn0p4aGcmMzZAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ<PDw;TRCwAvP|I%{WgMK}_kFuwd+o$=NF5ULa7xv>p=#Rjh^mNGszj865E0@J
zC>O5Wdf<Zi2ROk6Avi-1<q}mqgpe8$kQxP)76^4o^KjyInyeqY>-ByQ4lax|(rBa^
zjfQ^RScl(k;EzXtBkN=!jYi6{-IS9Jb-ilFxIFLn+lv<#rhi`fa%IOV%|F>~v$)XT
zhqPls;3*gp7-LK)GSgA&Oww+dg23QF!CD?Dx=RP!`*T60){BnyNveyOG2)Do5<~>X
zc&Zb}vo^N|gD{+tyIZs4d3|yE(%H#YE5zN^e_*9@Q>82OQ(K;T@XPPsTbHLtzsO1Z
zt~faHaMJXPx7NP@+6}ax9XppFto)X(1|C+wyN_sO2CpwpL*<J2^v+><ZKL{CCsxks
z$$?v73L=+w(dou?)N1rMk3x6D3-Lnt80oN$Z4+THSHicSZ^Jv@1S975WgWP73XDNB
z0t5&EpatiN#W`$lgG&Y`7;JDTm7ozs;Fd<(vH=)KC1H#Ki~&1t`0(4!o<Rfy^k@tK
zfB<ktP+B9=3QB88t)Pv81|V{Md324@MAS<H&@lf=7-L{yV6;Y}BseihA{b+kC=D^9
zLc~o^M~Nh^4M?E3!2qCM5rOrJwS?3Rj0oLCtMZV5h<7$`P<3bdqM-g77l@?>Jv~Ml
zf;RO3qC^6TG3aW80Uj1Ej}*X{%6%WUs}J9NDa%kA9Kc^*h<x0Ji2}5p0&3Z_IP}|4
zT4UVpV#tbMh;ZKjah^x@qF@Xi#+mALJN)!B4sI?_q53F~-O4`B4cmA%yMgtrg(Pg@
zMY{r09dsxSxnFtqaWQ{YXsb^o=7h`0N6<1TO#ow8vKT!zgrmI%PRR;NLl&x456vhB
z13<Bl;@sQ!E-k<JKK*p(o0qkg<yN(FE!cf<Ev!Bq5yl7S9NIWw+yZfe=N%zv`e1GW
z&o93F@%YTbN13$k)9Mc^$PA4l3_`f+%y7`C&(;6DcQroVTj<m(<!<vyilE>f)ZmPk
z>k|v_d@wk1<}=61z_A5{F$P*DP;m&6>pv8ZdpkQadHcCnmfWMqTQe5P*J_(<*N01{
qcHxa1H&1H&_mij%CzS>O{5t>|r=oXrx)#|00000<MNUMnLSTY+DYY#C

literal 0
HcmV?d00001

diff --git a/src/icons/versions/TestVersion.png b/src/icons/versions/TestVersion.png
new file mode 100644
index 0000000000000000000000000000000000000000..13bf0e599f68696bf9eb7d95ffbcdd03c0a40dd7
GIT binary patch
literal 829
zcmV-D1H$}?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ;!%0LzRCwBCkUMW&We|p+`7URVcWq}k4ha^>ghV95MFc632!%mHG?Dl>@B`>+
z`2$EuAR#I$Dg;!Bn~;$x3~M45$1&P<_HxeoZbPva;xf$?^UnJ|GjjCvArQ^!?C8za
zYWnh(!H$TC!UA-THC|8<aUzJQ2);M^M(h(Gsru}|h%@C*=T6^B+x^>nPw$r)TS`76
zuO8rBB_a-`!We@hrVA&pt>R!TX85&B?H~6m|KRQChL7%b(czlUFm}ZJ@DRVZPd(a&
zIHxSXqv_6ZeuExdPVipHd+)l{;`qSUXU}hjzy^Wo@|^zmW2#G$UbV!g2`Awyzs>LR
z!qp7MBV~r0KfJM6j_*0F^HsfNU2Vw<wHQKZ(cw0+o#5Jl^kx`yjk>o<Dh2BV?|UL*
z#CcyggJCZYFYS<vuzr{T0!B!&W6;icYIsJMP5~%lG1UO$Jx+-#8dZuSg>~sgFW`;f
z`vVZgU5u<i5mC3W>a=7jaVa^*zX=cpm9<>{V+yEIO6Lu!Z=7f_In5=91}$sye~OX+
zJ7fV(wLz_SqRDGo+R{x4$)gvM@~=e!T^k5WWfM7WYfgQ2k{W2w`PIG1i90|wkaH#`
zC6z)hN-0V#O3sBQ8E*P-x#NDwrVN53FLR7d8MoJ&utR9)bg>Y1ohn9f*5aMT8%yJB
zerc!NvR?^lAx=y1IV|jWI$>O%WMBeaF{Dy1@Yg3))-vc>Ts^{RN9q>j)QO|I`F+z&
zUeCE5Iqyk0cEcCkHJ=ixL7>u(AM+a=#{*1Uuu-P0Z2hp*H-2)qck9Dds^)D|zpolM
zy5iX^kJytV4YCCaH4Bb8lb9`)iOj=hZnj^2r(a+H#Qj<K8?A4De8t*lSJUQxCX}ZC
z(%J9T{+Eg^0xF`i==!g0w2!YDvbj8Z=JVOs?g!^$@?Qf0JBD{=+eAf600000NkvXX
Hu0mjft_gYO

literal 0
HcmV?d00001