From bcd40d5acfb96463e5b57841159531a99af54a69 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 5 Nov 2023 19:42:38 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BE=D1=82=D1=80=D0=B8=D1=81=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B0=20StateSummary?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  12 +++++-----
 .../SapforTasksPackageInterface.java          |  13 ++++++-----
 .../UI/SapforTasksPackageTree.java            |   4 ++--
 .../UI/SapforVersionsTreeCellRenderer.java    |  21 ++++++++----------
 .../SapforTasksPackage/UI/StateSummary.java   |  11 +++++++++
 .../SapforTasksPackage/UI/TreeSummary.java    |   8 ++++++-
 src/icons/versions/DoneStateSummary.png       | Bin 0 -> 694 bytes
 src/icons/versions/ErrorsStateSummary.png     | Bin 0 -> 644 bytes
 src/icons/versions/UnknownStateSummary.png    | Bin 0 -> 561 bytes
 9 files changed, 44 insertions(+), 25 deletions(-)
 create mode 100644 src/icons/versions/DoneStateSummary.png
 create mode 100644 src/icons/versions/ErrorsStateSummary.png
 create mode 100644 src/icons/versions/UnknownStateSummary.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 369bec7c..fa31b75f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,13 +7,15 @@
   </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/StateSummary.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java" afterDir="false" />
+      <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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.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/Visual_DVM_2021/UI/Main/PackageVersionsComparisonForm.java" beforeDir="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" />
+      <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/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 0b864f43..06742e52 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.ConfigurationDescription;
+import SapforTestingSystem.SapforTasksPackage.UI.StateSummary;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.File;
@@ -43,9 +44,10 @@ public class SapforTasksPackageInterface {
         //--
         DefaultMutableTreeNode root = new DefaultMutableTreeNode(package_in.id);
         for (TaskState state : sortedTasks.keySet()) {
-            int count = 0;
             //--
-            DefaultMutableTreeNode stateNode = new DefaultMutableTreeNode(state.getDescription());
+            StateSummary stateSummary = new StateSummary(state);
+            //--
+            DefaultMutableTreeNode stateNode = new DefaultMutableTreeNode(stateSummary);
             LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = sortedTasks.get(state);
             for (String configuration_id : tasksByConfigurations.keySet()) {
                 //--
@@ -55,7 +57,8 @@ public class SapforTasksPackageInterface {
                 for (String group : groups_tasks.keySet()) {
                     DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(group);
                     for (SapforTask task : groups_tasks.get(group)) {
-                        count++;
+                        //--
+                        stateSummary.count++;
                         //--
                         if (configurationNode == null)
                             configurationNode = new DefaultMutableTreeNode(new ConfigurationDescription(configuration_id, task));
@@ -66,8 +69,8 @@ public class SapforTasksPackageInterface {
                 }
                 stateNode.add(configurationNode);
             }
-            if (stateNode.getChildCount() > 0) {
-                stateNode.setUserObject(state.getDescription() + ": " + count);
+            if (stateSummary.count > 0) {
+                stateSummary.refreshText();
                 root.add(stateNode);
             }
         }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java b/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java
index 1ae921b7..de5c8b9b 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java
@@ -1,6 +1,7 @@
 package SapforTestingSystem.SapforTasksPackage.UI;
 import Common.Current;
 import Common.UI.Trees.DataTree;
+import Common.UI.Trees.TreeRenderers;
 import Common.UI.UI;
 import SapforTestingSystem.Json.SapforVersion_json;
 
@@ -19,12 +20,11 @@ public class SapforTasksPackageTree extends DataTree {
     @Override
     public void LeftMouseAction2() {
     }
-    /*
+
     @Override
     public TreeRenderers getRenderer() {
         return TreeRenderers.RendererSapforVersion;
     }
-     */
     @Override
     public Current getCurrent() {
         return current;
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java b/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
index 4d6fab8b..fe32a86e 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
@@ -1,32 +1,29 @@
 package SapforTestingSystem.SapforTasksPackage.UI;
 import Common.UI.Trees.StyledTreeCellRenderer;
-import SapforTestingSystem.Json.SapforVersion_json;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
-import java.net.URL;
 public class SapforVersionsTreeCellRenderer extends StyledTreeCellRenderer {
     public java.awt.Component getTreeCellRendererComponent(
             JTree tree, Object value,
             boolean selected, boolean expanded,
             boolean leaf, int row, boolean hasFocus) {
         super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
-        URL imageUrl = null;
         Object o = ((DefaultMutableTreeNode) value).getUserObject();
-        if (o instanceof SapforVersion_json) {
-            SapforVersion_json version_json = (SapforVersion_json) o;
+        if (o instanceof TreeSummary) {
+            TreeSummary summary = (TreeSummary) o;
             setForeground(tree.getForeground());
             setFont(getFont().deriveFont((float) 14.0));
-            imageUrl = getClass().getResource("/icons/versions/" +
-                    (version_json.success ? "Version" : "BadVersion") +
-                    ".png");
-            if (imageUrl != null) {
-                setIcon(new ImageIcon(imageUrl));
-            }
-        } else {
+            setIcon(summary.getIcon());
+        }
+        /*
+        else
+
+        {
             setForeground(tree.getForeground());
             setFont(getFont().deriveFont((float) 14.0));
         }
+         */
         return this;
     }
 }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java b/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java
index 10fa995c..1db5cf9e 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java
@@ -10,4 +10,15 @@ public class StateSummary extends TreeSummary{
     public void refreshText(){
         text = state.getDescription()+" : "+count;
     }
+    @Override
+    public String getImageKey() {
+        switch (state){
+            case Done:
+                return "DoneStateSummary";
+            case DoneWithErrors:
+                return "ErrorsStateSummary";
+            default:
+                return "UnknownStateSummary";
+        }
+    }
 }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java b/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java
index c3639932..fc616668 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java
@@ -1,9 +1,15 @@
 package SapforTestingSystem.SapforTasksPackage.UI;
+import javax.swing.*;
+import java.util.Objects;
 public abstract class TreeSummary {
-    public String text="";
+    public String text = "";
     public abstract void refreshText();
     @Override
     public String toString() {
         return text;
     }
+    public ImageIcon getIcon() {
+        return new ImageIcon(Objects.requireNonNull(getClass().getResource("/icons/versions/" + getImageKey() + ".png")));
+    }
+    public abstract String getImageKey();
 }
diff --git a/src/icons/versions/DoneStateSummary.png b/src/icons/versions/DoneStateSummary.png
new file mode 100644
index 0000000000000000000000000000000000000000..065d82c9e3f7eff12f746537ca4ce07ba76cfb06
GIT binary patch
literal 694
zcmV;n0!jUeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ;JV``BRCwA{lS^(?M-+y?s$1Q5(+mOx^AJpsm_>;guoIR5VlObyC=19W>tF{U
zlu-;uAY$3XeIHflmBGD@%~2icO#biuRr)KPd^maawf_5J$Bvvb0c^TMw$ru0KY#iB
zY_(b)cU?!$8GxKKDJ3F;^?FS?Tpv7G|9tS%seGhRurO|woBVe0>(lLa`=%fI_g&YK
zQknrN!#pzd!yiRN`@7$6^B~`2Ur~ee-8tLM_Wt$F_4}~br2QeM%*pWSUHS9kuP367
zE*CPH6yV{w&uwm)8R~|rAgZV-s>)c$r{!(Df0z$5xyzJX$SGmrs2fciRVt&5Ofu0-
zkZ6bsA`RKeqf+R0f*t{QcE}kuqef-2O7)4+MkcE?Z<s6Uin?K97sWklA``^CIgA!U
z^?C);7=1!rP*=<hF~KISrD>bA80JQ@gyX0y&4j9zYL&qT1|6xb(rTN#HM*Xu^tG>&
z6;Dp2m>qayw2@v0cG5G{fz~S443~iBxH%g+tmSMtum8mbqfbZ@S_tBE>+<5E0Rk8#
zgYX2F=qyj=pR?ofYda-U%qiQa#KAo-MGD9QQf6q2v3RwCRgg$T4ubd&zyln@01dFX
z1bL7(kA=$M+2^RHC31144PtSE1|jnt5p>ZF#V&L*)#bCK?>Q$H2eCM?1>&(743aUH
zgJE?peWRpuDU2(C{S_ABzQlw(o1<NMa^siRFYi7-JKEfSY;KEq-uwgbN(Hbg<@EU5
chu{An0IvAZtHW}br2qf`07*qoM6N<$f~w&<UH||9

literal 0
HcmV?d00001

diff --git a/src/icons/versions/ErrorsStateSummary.png b/src/icons/versions/ErrorsStateSummary.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4afd309e55e47118582fa4f526f43937b5951fb
GIT binary patch
literal 644
zcmV-~0(<?5P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ;3Q0skRCwA{lFd#OK@^3*s;&_k1``1nNQ8x9ZRBNK`#wH|8{Wi?E5nk7LqZIJ
z5yHUCbp7A!qI<@sl9Q8E?sxC0?rVNsTzq@0`c)qvG1dZL$7B4PH`BYjyDx3qPK_}*
z=P<^+(DCsx&Nz2;V(ng@&0sWwS}_L)n6tCJ@y^bV#q;x}wH9M-2g166mRi5N6oS7$
zJw=X=K$Xpz&v`wW9Bxl0hZxh{^=<&uH2k@`x^%ne=bxVT_b~w0qQ;;ihzL?EB0{Yd
zDTPuBHRsMnSUx<Qx!u|9gS)w*X&S6^7;90Ht}rEPjAZZ0-jh-y^-Uxtsxcp(I=3Xo
zcU=IB1!~R^0vaRYJrY9arF5xEL32j7x0g<>jTnOhS}R%#q=d$ZhS0%l4H`(!tU?H`
zLMUyE1r$J}E9m1_@2TEXyeG%lJtHMj&a|UZaH(x0%Ow^lB2Ws_gJrcMFPEgY?Vwso
zKmrPoor`XHeI3U4_o(-nl+cvA_vK72g<2~a$URgCN=*~o({$?P_O|=C{gMC(AgUWE
z4^-9(tPL)zwj*OOs#w@8lk{3o+d#c4P^@j8S8eTjdN1uYY_d+0dRIW3rgaO|ApLan
zf017_8K#gyO%e(2cZ~BBYsr1|A*cg*2m-tUe$M9$^L}gV;J~@he^;xq_FrHq20l2(
eKwiMbzX1SUVU!t25EthF0000<MNUMnLSTYo4Hb<5

literal 0
HcmV?d00001

diff --git a/src/icons/versions/UnknownStateSummary.png b/src/icons/versions/UnknownStateSummary.png
new file mode 100644
index 0000000000000000000000000000000000000000..baaa921008c81bfbbda969422e72268b683635c5
GIT binary patch
literal 561
zcmV-10?z%3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ-w@E}nRCwBKQ@f7aFc2J)YZ(w+IHi3#BQCDED%Jf-ejz`T^r`Ycsazj|bb$fE
z0^$gkEsErFnZ_h^jtLA_+Q(=HTB`ki|K)T#efG{lX$=6VstQV}Urp0|s;cTY5kX&T
zT5Bk!007Jkn$PF&-z}HRwrydwhKQh=&G2EneOW9PKQ5QcPh(6OQc4wcUH6?r2*YeP
z!{cUyd{Rm{9*?N&dR^D`I_EP<R${GvrQL4#F@yl4b+I5KZxCZdWCq6wW-hSSzEIn?
zkJ+Okf>x>wg%IGqhjR|jx$^G4M+gDKFl@C_>MSBiDIp6K5ioOUo`RVXW6V8g5|NRJ
zkWxa75lSgAGeQU@PM@baYwbwhdzVszh(K#yh_Zq#e~PT8?|VnqTF1-~5vZ&GsdsBF
z#&ImZV~oW@jL}iob<P+A?|ms|1v%dSm8@7qMrxYIX6e%{n>J=!w?rahiJ7f2rZi8N
zDdXN=6oL@K5M%sr)20OXNUr&TthHm_^;?1*Z|&q7082*euJ8MD+wOh+W~ki6)oOL7
z&BMdjr|0Lt>-GAHncooHs+k@l`g1rOzWo~jK5h{+l38Z`00000NkvXXu0mjfWt8uc

literal 0
HcmV?d00001