From 5a857878d1a0895eaccffb7713f20a52e90aa6d6 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 6 Nov 2023 22:20:18 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D0=B4=D0=B5=D1=80=D0=B5=D0=B2=D0=B0?=
 =?UTF-8?q?=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B9=20=D0=BF=D0=B0=D0=BA?=
 =?UTF-8?q?=D0=B5=D1=82=D0=B0.=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BA=D0=B0=D1=82=D0=B5=D0=B3=D0=BE=D1=80=D0=B8=D1=8E?=
 =?UTF-8?q?=20=D0=BF=D0=BE=20=D1=81=D0=BE=D0=B2=D0=BF=D0=B0=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=D0=BC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  16 +++-
 .../Json/SapforTasksResults_json.java         |  61 +++++++++------
 .../SapforTask/MatchState.java                |   4 +-
 .../SapforTask/SapforTask.java                |   9 ++-
 .../SapforTasksPackageInterface.java          |  71 ++++++++++--------
 .../UI/ConfigurationSummary.java              |  11 +--
 .../SapforTasksPackage/UI/GroupSummary.java   |  14 ++--
 .../SapforTasksPackage/UI/MatchesSummary.java |  24 ++++++
 .../SapforTasksPackage/UI/PackageSummary.java |  14 ++++
 .../UI/SapforPackageTreeNode.java             |  12 +++
 .../UI/SapforVersionsTreeCellRenderer.java    |  19 +----
 .../SapforTasksPackage/UI/StateSummary.java   |   7 +-
 .../SapforTasksPackage/UI/VersionSummary.java |  18 +++++
 src/icons/versions/Match.png                  | Bin 0 -> 980 bytes
 src/icons/versions/NotMatch.png               | Bin 0 -> 808 bytes
 15 files changed, 186 insertions(+), 94 deletions(-)
 create mode 100644 src/SapforTestingSystem/SapforTasksPackage/UI/MatchesSummary.java
 create mode 100644 src/SapforTestingSystem/SapforTasksPackage/UI/PackageSummary.java
 create mode 100644 src/SapforTestingSystem/SapforTasksPackage/UI/SapforPackageTreeNode.java
 create mode 100644 src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.java
 create mode 100644 src/icons/versions/Match.png
 create mode 100644 src/icons/versions/NotMatch.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 59817749..f2d905b2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,11 +7,21 @@
   </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/TestVersionSummary.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/icons/versions/TestVersion.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/MatchesSummary.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/PackageSummary.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforPackageTreeNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/versions/Match.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/versions/NotMatch.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/Json/SapforTasksResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksResults_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/MatchState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/MatchState.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/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/GroupSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/GroupSummary.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/Json/SapforTasksResults_json.java b/src/SapforTestingSystem/Json/SapforTasksResults_json.java
index 6e1af7b8..1dfce999 100644
--- a/src/SapforTestingSystem/Json/SapforTasksResults_json.java
+++ b/src/SapforTestingSystem/Json/SapforTasksResults_json.java
@@ -1,5 +1,6 @@
 package SapforTestingSystem.Json;
 import GlobalData.Tasks.TaskState;
+import SapforTestingSystem.SapforTask.MatchState;
 import SapforTestingSystem.SapforTask.SapforTask;
 import com.google.gson.annotations.Expose;
 
@@ -13,29 +14,6 @@ public class SapforTasksResults_json {
     public long EndDate = 0;
     @Expose
     public List<SapforTask> tasks = new Vector<>();
-    public LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> sortTasksByConfigurationsAndGroups() {
-        LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = new LinkedHashMap<>();
-        //--
-        for (SapforTask task : tasks) {
-            LinkedHashMap<String, Vector<SapforTask>> groups_tasks = null;
-            if (tasksByConfigurations.containsKey(task.sapfor_configuration_id)) {
-                groups_tasks = tasksByConfigurations.get(task.sapfor_configuration_id);
-            } else {
-                groups_tasks = new LinkedHashMap<>();
-                tasksByConfigurations.put(task.sapfor_configuration_id, groups_tasks);
-            }
-            Vector<SapforTask> tasks = null;
-            if (groups_tasks.containsKey(task.group_description)) {
-                tasks = groups_tasks.get(task.group_description);
-            } else {
-                tasks = new Vector<>();
-                groups_tasks.put(task.group_description, tasks);
-            }
-            tasks.add(task);
-        }
-        return tasksByConfigurations;
-    }
-    //--
     public LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortTasksByStatesConfigurationsAndGroups() {
         LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> res = new LinkedHashMap<>();
         //рассортировать задачи по конфигурациям.
@@ -65,4 +43,41 @@ public class SapforTasksResults_json {
         }
         return res;
     }
+    //---
+    public LinkedHashMap<MatchState, LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>>> sortTasksForTree() {
+        LinkedHashMap<MatchState, LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>>> res = new LinkedHashMap<>();
+        for (MatchState matchState : MatchState.values()) {
+            LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> state_tasks = new LinkedHashMap<>();
+            res.put(matchState, state_tasks);
+            //--
+            for (TaskState state : TaskState.values()) {
+                LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> configuration_tasks = new LinkedHashMap<>();
+                state_tasks.put(state, configuration_tasks);
+                //--
+                for (SapforTask task : tasks) {
+                    if (task.match.equals(matchState) && task.state.equals(state)) {
+                        LinkedHashMap<String, Vector<SapforTask>> groups_tasks = null;
+                        if (configuration_tasks.containsKey(task.sapfor_configuration_id)) {
+                            groups_tasks = configuration_tasks.get(task.sapfor_configuration_id);
+                        } else {
+                            groups_tasks = new LinkedHashMap<>();
+                            configuration_tasks.put(task.sapfor_configuration_id, groups_tasks);
+                        }
+                        Vector<SapforTask> tasks = null;
+                        if (groups_tasks.containsKey(task.group_description)) {
+                            tasks = groups_tasks.get(task.group_description);
+                        } else {
+                            tasks = new Vector<>();
+                            groups_tasks.put(task.group_description, tasks);
+                        }
+                        tasks.add(task);
+                    }
+                }
+            }
+            //--
+        }
+        //--
+        //рассортировать задачи по конфигурациям.
+        return res;
+    }
 }
diff --git a/src/SapforTestingSystem/SapforTask/MatchState.java b/src/SapforTestingSystem/SapforTask/MatchState.java
index e0074cba..2c8d1e0a 100644
--- a/src/SapforTestingSystem/SapforTask/MatchState.java
+++ b/src/SapforTestingSystem/SapforTask/MatchState.java
@@ -13,9 +13,9 @@ public enum MatchState implements StatusEnum {
             case Unknown:
                 return "неизвестно";
             case Match:
-                return "да";
+                return "совпадений";
             case NotMatch:
-                return "нет";
+                return "различий";
             default:
                 return "?";
         }
diff --git a/src/SapforTestingSystem/SapforTask/SapforTask.java b/src/SapforTestingSystem/SapforTask/SapforTask.java
index 3a48f000..66c28944 100644
--- a/src/SapforTestingSystem/SapforTask/SapforTask.java
+++ b/src/SapforTestingSystem/SapforTask/SapforTask.java
@@ -5,6 +5,7 @@ import Common.Database.DBObject;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
 import SapforTestingSystem.Json.SapforVersion_json;
+import SapforTestingSystem.SapforTasksPackage.UI.VersionSummary;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.google.gson.annotations.Expose;
 import com.sun.org.glassfish.gmbal.Description;
@@ -49,6 +50,9 @@ public class SapforTask extends DBObject {
     @Description("IGNORE")
     @Expose
     public Vector<SapforVersion_json> variants = new Vector<>();
+    //----------
+    @Description("IGNORE")
+    public MatchState match = MatchState.Match;
     //-----------
     public SapforTask() {
     }
@@ -61,7 +65,7 @@ public class SapforTask extends DBObject {
         for (SapforVersion_json version_json : versions) {
             version_json.init(configurationRoot);
             //-
-            child = new DefaultMutableTreeNode(version_json);
+            child = new VersionSummary(version_json);
             if (parent == null) {
                 root = child;
                 parent = child;
@@ -72,10 +76,9 @@ public class SapforTask extends DBObject {
             //-
         }
         if (parent != null) {
-
             for (SapforVersion_json version_json : variants) {
                 version_json.init(configurationRoot);
-                parent.add(new DefaultMutableTreeNode(version_json));
+                parent.add(new VersionSummary(version_json));
             }
         }
         //--
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
index 8cb6e692..c5de4c23 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
@@ -4,10 +4,9 @@ import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
 import SapforTestingSystem.Json.SapforTasksResults_json;
+import SapforTestingSystem.SapforTask.MatchState;
 import SapforTestingSystem.SapforTask.SapforTask;
-import SapforTestingSystem.SapforTasksPackage.UI.ConfigurationSummary;
-import SapforTestingSystem.SapforTasksPackage.UI.GroupSummary;
-import SapforTestingSystem.SapforTasksPackage.UI.StateSummary;
+import SapforTestingSystem.SapforTasksPackage.UI.*;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.File;
@@ -38,50 +37,62 @@ public class SapforTasksPackageInterface {
     public static boolean isLoaded(SapforTasksPackage package_in) {
         return getLoadedSign(package_in).exists();
     }
+    //--
     public static DefaultMutableTreeNode buildTree(SapforTasksPackage package_in) {
+        PackageSummary root = new PackageSummary();
         SapforTasksResults_json results_json = getLocalResults(package_in);
-        //--  флаги                 группы
-        LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = results_json.sortTasksByStatesConfigurationsAndGroups();
+        LinkedHashMap<MatchState, LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>>> sortedTasks =
+                results_json.sortTasksForTree();
         //--
-        DefaultMutableTreeNode root = new DefaultMutableTreeNode(package_in.id);
-        for (TaskState state : sortedTasks.keySet()) {
+        for (MatchState match_state : sortedTasks.keySet()) {
             //--
-            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()) {
+            MatchesSummary matchesSummary = new MatchesSummary(match_state);
+            //---
+            LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> task_states = sortedTasks.get(match_state);
+            //---
+            for (TaskState state : task_states.keySet()) {
                 //--
-                ConfigurationSummary configurationSummary = new ConfigurationSummary();
-                DefaultMutableTreeNode configurationNode = new DefaultMutableTreeNode(configurationSummary);
+                StateSummary stateSummary = new StateSummary(state);
                 //--
-                LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
-                for (String group : groups_tasks.keySet()) {
+                LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = task_states.get(state);
+                for (String configuration_id : tasksByConfigurations.keySet()) {
                     //--
-                    GroupSummary groupSummary = new GroupSummary(group);
-                    DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(groupSummary);
+                    DefaultMutableTreeNode configurationNode = null;
                     //--
-                    for (SapforTask task : groups_tasks.get(group)) {
+                    LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
+                    for (String group : groups_tasks.keySet()) {
                         //--
-                        stateSummary.count++;
+                        GroupSummary groupSummary = new GroupSummary(group);
                         //--
-                        if (configurationSummary.text.isEmpty())
-                            configurationSummary.init(configuration_id, task);
-                        //--
-                        groupNode.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id)));
-
+                        for (SapforTask task : groups_tasks.get(group)) {
+                            //--
+                            stateSummary.count++;
+                            matchesSummary.count++;
+                            root.count++;
+                            //--
+                            if (configurationNode == null) {
+                                configurationNode = new ConfigurationSummary(configuration_id, task);
+                            }
+                            //--
+                            groupSummary.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id)));
+                        }
+                        if (configurationNode != null)
+                            configurationNode.add(groupSummary);
                     }
-                    configurationNode.add(groupNode);
+                    stateSummary.add(configurationNode);
+                }
+                if (stateSummary.count > 0) {
+                    matchesSummary.add(stateSummary);
                 }
-                stateNode.add(configurationNode);
             }
-            if (stateSummary.count > 0) {
-                stateSummary.refreshText();
-                root.add(stateNode);
+            //---
+            if (matchesSummary.count > 0) {
+                root.add(matchesSummary);
             }
         }
         return root;
     }
+    //--
     public static DefaultMutableTreeNode getTree(SapforTasksPackage package_in) {
         if (package_in.root == null)
             package_in.root = buildTree(package_in);
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java b/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java
index ad72e2a3..5c3fc679 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java
@@ -5,24 +5,21 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 
 import java.util.Arrays;
 import java.util.Vector;
-public class ConfigurationSummary extends TreeSummary {
+public class ConfigurationSummary extends SapforPackageTreeNode {
     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) {
+    public ConfigurationSummary(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);
+    public String toString() {
+        return flags + " " + String.join("→", codes_descriptions);
     }
     @Override
     public String getImageKey() {
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/GroupSummary.java b/src/SapforTestingSystem/SapforTasksPackage/UI/GroupSummary.java
index 0aa91951..d429b9ed 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/GroupSummary.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/GroupSummary.java
@@ -1,13 +1,15 @@
 package SapforTestingSystem.SapforTasksPackage.UI;
-public class GroupSummary extends TreeSummary {
-    @Override
-    public void refreshText() {
-    }
+public class GroupSummary extends SapforPackageTreeNode {
+    public String group_name = "";
     @Override
     public String getImageKey() {
         return "Group";
     }
-    public GroupSummary(String group_name) {
-        text = group_name;
+    public GroupSummary(String group_name_in) {
+        group_name = group_name_in;
+    }
+    @Override
+    public String toString() {
+        return group_name;
     }
 }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/MatchesSummary.java b/src/SapforTestingSystem/SapforTasksPackage/UI/MatchesSummary.java
new file mode 100644
index 00000000..bdf39968
--- /dev/null
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/MatchesSummary.java
@@ -0,0 +1,24 @@
+package SapforTestingSystem.SapforTasksPackage.UI;
+import SapforTestingSystem.SapforTask.MatchState;
+public class MatchesSummary extends SapforPackageTreeNode {
+    public MatchState state;
+    public int count = 0;
+    public MatchesSummary(MatchState state_in) {
+        state = state_in;
+    }
+    @Override
+    public String toString() {
+        return state.getDescription() + " : " + count;
+    }
+    @Override
+    public String getImageKey() {
+        switch (state) {
+            case Match:
+                return "Match";
+            case NotMatch:
+                return "NotMatch";
+            default:
+                return "TestVersion";
+        }
+    }
+}
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/PackageSummary.java b/src/SapforTestingSystem/SapforTasksPackage/UI/PackageSummary.java
new file mode 100644
index 00000000..fc372479
--- /dev/null
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/PackageSummary.java
@@ -0,0 +1,14 @@
+package SapforTestingSystem.SapforTasksPackage.UI;
+public class PackageSummary extends SapforPackageTreeNode {
+    public int count = 0;
+    @Override
+    public String getImageKey() {
+        return null;
+    }
+    public PackageSummary() {
+    }
+    @Override
+    public String toString() {
+        return "всего задач : " + count;
+    }
+}
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforPackageTreeNode.java b/src/SapforTestingSystem/SapforTasksPackage/UI/SapforPackageTreeNode.java
new file mode 100644
index 00000000..558034e2
--- /dev/null
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/SapforPackageTreeNode.java
@@ -0,0 +1,12 @@
+package SapforTestingSystem.SapforTasksPackage.UI;
+import javax.swing.*;
+import javax.swing.tree.DefaultMutableTreeNode;
+import java.util.Objects;
+public abstract class SapforPackageTreeNode extends DefaultMutableTreeNode {
+    public ImageIcon getIcon() {
+        return (getImageKey() != null) ?
+                new ImageIcon(Objects.requireNonNull(getClass().getResource("/icons/versions/" + getImageKey() + ".png")))
+                : null;
+    }
+    public abstract String getImageKey();
+}
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java b/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
index 105af8cc..6889e937 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
@@ -1,31 +1,18 @@
 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,
             boolean selected, boolean expanded,
             boolean leaf, int row, boolean hasFocus) {
         super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
-        Object o = ((DefaultMutableTreeNode) value).getUserObject();
-        if (o instanceof TreeSummary) {
-            TreeSummary summary = (TreeSummary) o;
+        if (value instanceof SapforPackageTreeNode) {
+            SapforPackageTreeNode node = (SapforPackageTreeNode) value;
             setForeground(tree.getForeground());
             setFont(getFont().deriveFont((float) 14.0));
-            setIcon(summary.getIcon());
-        }
-        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());
-            }
+            setIcon(node.getIcon());
         }
         return this;
     }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java b/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java
index 57792617..3df3bc32 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java
@@ -1,15 +1,14 @@
 package SapforTestingSystem.SapforTasksPackage.UI;
 import GlobalData.Tasks.TaskState;
-public class StateSummary extends TreeSummary {
+public class StateSummary extends SapforPackageTreeNode {
     public TaskState state;
     public int count = 0;
     public StateSummary(TaskState state_in) {
         state = state_in;
-        refreshText();
     }
     @Override
-    public void refreshText() {
-        text = state.getDescription() + " : " + count;
+    public String toString() {
+        return state.getDescription() + " : " + count;
     }
     @Override
     public String getImageKey() {
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.java b/src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.java
new file mode 100644
index 00000000..dbb679f5
--- /dev/null
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.java
@@ -0,0 +1,18 @@
+package SapforTestingSystem.SapforTasksPackage.UI;
+import SapforTestingSystem.Json.SapforVersion_json;
+public class VersionSummary extends SapforPackageTreeNode{
+    public String version_name = "";
+    public String version_description = "";
+    public VersionSummary(SapforVersion_json version_json) {
+        version_name = version_json.Home.getName();
+        version_description = version_json.description;
+    }
+    @Override
+    public String getImageKey() {
+        return "TestVersion";
+    }
+    @Override
+    public String toString() {
+        return version_name+ " : " +version_description;
+    }
+}
diff --git a/src/icons/versions/Match.png b/src/icons/versions/Match.png
new file mode 100644
index 0000000000000000000000000000000000000000..95b1730ff0312a1626f9a73e822236724cc22646
GIT binary patch
literal 980
zcmV;_11tQAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000tn
z000tn0p4aGcmMzZAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ<T1iAfRCwBSlV5C8Wf;bv@0`;=YrEN&GB>uB6+$MmC3G$%nn*x`x5j7|HIXcu
zC?RlR@WPv+5QxSsQ3)|djeio1WWmLV$_*+yMXNa3zfu<*ZD~77*FT)o?a=Rh-}idq
z6c^)j^<F&h^SgN8hjGpsV+^ZAAWhSmBX5z#%kaB{@ah35QjDN(+lXNNJpcfM1_enC
zVH&#T7FVmk?pmm)x?-Vwl7Ked=I^n+h98RLKSahkXDiDjR09s#o9a&a71J)hkXrn1
zXs+_ZUPUq-YU-TmUAy~OcQ8KI7U+Rg4*ORCL6Y=V?OfcYdkPX_Prz979)KE`cEsX~
zZQo|z*?-NP9^4$+d1QO^siQ$}J5wY9hdaz}EF)8yx;v5kWZ_zE_I}H*L2wD-NGL%d
zBIK$w_&hao@YwksG?6<qC>;gP9WaMW=BOnjZzb16e6fgIZ%X@I&2_0HBT`^Yqq1Ew
z8bWMPsyufg_rXcCabw_#zSjnPu25Z*)S!x;@1L*za#m-0)#q-mPZp<8=XEk%E}E~-
z<9Oo4p?zofjdSH`e<1eENaa?(r?i}oYfOWtF&BL9P%iB4cta?;l&)q&W0yaD^HOoD
ze|ljCAJ2{+`YQeP@TSnlw>^4OS&~?2GFtMB%jqo)fWZJLC148+LU90uoSBcmo;W@l
z3&y^@Sh#rLzRr7J8rr(&a5UVBOl5M_(`bSmn7q_^z5e@iZru~;4zI7i`rykCg}kBC
zxj)Vw*w(Ra`04o2;l4Y2A%p{6GrDYHc0_#LvjhObk!;Dn=}Kfzw`VGoeYK@xfD|EL
zE3E(Q@|mIQW)UO_B#9MjbNJ}e!IN(#o=lm`ivi(Cz;OgyvQ1n_pW1Tbr^kzl?CBlp
z@+2JI01<%{fpd;4rJwOdYUKH&=eMsqqd}x#=pNSFx_f?IOV1<C?$*M1=KUic!~d>T
zD^&_sG7@ds+BTm3aDU#K85~&m=y3Fo_$YxGu+jwv2A?ZvH+#e17p<#3wy^rMH-GaN
z>sOvlE`GE3$NZ^qq$xV_@LexHwmGtMOp$^jxw;Ft#fYF>QZ}5NHM7fX+~`{C-;iwe
zZ=Ck(K3gb(zv%eC0Dv)#06=Ft7ytsWLj8~T&jA4ApXY+AJupoG0000<MNUMnLSTZC
C{m;_?

literal 0
HcmV?d00001

diff --git a/src/icons/versions/NotMatch.png b/src/icons/versions/NotMatch.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6f810f5ff53913ed9620f2ba2cca529eb88411f
GIT binary patch
literal 808
zcmV+@1K0eCP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000ie
z000ie0hKEb8vp<RAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ;u1Q2eRCwBKlS^n-R}_Z7wfEWQoZR=r80;Vo2nCZM*nxv;j2KO5<wmL$T13I2
z4ooy16({Yi&<>qDlVURo#+E`yW)iU!+A8*9nizwSwzPTPoO@o|!HtQwcfrSE!Fv3I
zf64R5cWED5+h}@nt@+NpE`D@f2yMGA)qdC^jhAYjZ>47{g-7GT`qC*87m)v<qUJhp
zvOyTEdcHq5CTf#P`58|9<9L!fM$p?gcTrKW%Ikz%YoyWKa3;5K%s3IA-(XK+YB+2x
z4$wx05~X<qaa1n%bRyHSthVgO#2litI;&MUc|A$nEJ%`o9pVJ+{F%z0-v^pel@lXh
zbK{F&&}Bnc{?^In=E9I@7esbY#w*aGgf<<1q4?{V>o2QFMtS_`DNp{`2lg!0%nMHk
z-;5`zc0??%P{z$-+$@e;#Pk0?RVhChgdXzM581!Ji{9RYU?$LHsLGww(dPVnA_lO4
zMOhS96xJ%0@qYN!bzgvY9+4dV{Rimp?FM<5NNSYLqOdwWk>c$7KsyHQ6wvZyw2-@h
z1l<qbIRJ)+hUn>eyVY2_jIy1S;_rup^~K}j7!Xh(q)F4udUwWMx1n*b0(k&xwHkeW
zeJx)WjzWHfl9}^mWqK@0v;sj{t5N(mQs|f+w6+iHf3hQQW@d(Zz1}KBqq{EP`dNz6
z)M&W5bVQVcN}|xosBf=n1l#c$qH+KPAzZw4g)hIlxohz9AW}R@#a~eT``tB*QI5n9
zPiJ#K52R5Ef<H-`x3Q_hv6`EoAEUdwllZSmtZk{VXpHMq+_?At%Gw7<W%;KAvwN%a
zhm)X4+Du3z7n>Nc3O}ERBqnHV(RxKeltC$%BwC~1xHRRg{FALm&4YX6$P;31v3gsu
mg^lg}pAZ4koC#AgF9!gQFb{wNZ7Nm(0000<MNUMnLSTY3C3s!{

literal 0
HcmV?d00001