From 75c196f611ed235ed75b2d8910ba5be61d615dcf Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 26 Feb 2024 00:36:35 +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=D1=81=D1=80=D0=B0=D0=B2=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  11 ++
 .../SAPFOR/Json/SapforPackage_json.java       |  35 +++--
 .../SAPFOR/Json/SapforVersionMatchState.java  |   7 -
 .../SAPFOR/Json/SapforVersionState.java       |   3 +-
 .../SAPFOR/Json/SapforVersion_json.java       |  11 +-
 .../SAPFOR/Json/VersionComparisonState.java   |   6 +
 .../{MatchState.java => ComparisonState.java} |   2 +-
 .../SAPFOR/SapforTask/SapforTask.java         | 135 ++++++++----------
 .../SapforTasksPackage/UI/SapforTaskNode.java |   4 +-
 .../UI/SapforVersionsTreeCellRenderer.java    |   3 +-
 .../SapforTasksPackage/UI/VersionNode.java    |  22 +++
 .../SapforTasksPackage/UI/VersionSummary.java |  12 --
 .../UI/Main/SapforPackagesComparisonForm.java |  15 +-
 .../UI/Main/SapforVersionsComparisonForm.java |   2 +-
 src/icons/versions/MatchNormal.png            | Bin 0 -> 1305 bytes
 src/icons/versions/NotMatchNormal.png         | Bin 0 -> 1407 bytes
 16 files changed, 149 insertions(+), 119 deletions(-)
 delete mode 100644 src/TestingSystem/SAPFOR/Json/SapforVersionMatchState.java
 create mode 100644 src/TestingSystem/SAPFOR/Json/VersionComparisonState.java
 rename src/TestingSystem/SAPFOR/SapforTask/{MatchState.java => ComparisonState.java} (95%)
 create mode 100644 src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionNode.java
 delete mode 100644 src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionSummary.java
 create mode 100644 src/icons/versions/MatchNormal.png
 create mode 100644 src/icons/versions/NotMatchNormal.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0597abb2..b2b9544e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,20 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/icons/versions/MatchNormal.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/versions/NotMatchNormal.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/TestingSystem/SAPFOR/Json/SapforPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersionMatchState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/VersionComparisonState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersionState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersionState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/MatchState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTaskNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTaskNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionNode.java" afterDir="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/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java b/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
index 5e78bfbf..eb038ea5 100644
--- a/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
@@ -1,17 +1,17 @@
 package TestingSystem.SAPFOR.Json;
 import GlobalData.Tasks.TaskState;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-import TestingSystem.SAPFOR.SapforTask.MatchState;
+import TestingSystem.SAPFOR.SapforTask.ComparisonState;
 import TestingSystem.SAPFOR.SapforTask.SapforTask;
 import TestingSystem.SAPFOR.SapforTasksPackage.UI.PackageComparisonSummary;
 import TestingSystem.SAPFOR.SapforTasksPackage.UI.PackageSummary;
 import com.google.gson.annotations.Expose;
 
 import javax.swing.tree.DefaultMutableTreeNode;
+import java.io.File;
 import java.io.Serializable;
 import java.nio.file.Paths;
 import java.util.Comparator;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Vector;
 public class SapforPackage_json implements Serializable {
@@ -77,14 +77,16 @@ public class SapforPackage_json implements Serializable {
     //---------
     public void DropComparison() {
         comparison_root = null;
-        for (SapforTask task : tasks)
-            task.comparisonState = MatchState.Unknown;
+        for (SapforTask task : tasks) {
+            task.comparisonState = ComparisonState.Unknown;
+            for (SapforVersion_json version : task.versions)
+                version.comparisonState = VersionComparisonState.Unknown;
+            for (SapforVersion_json version : task.variants)
+                version.comparisonState = VersionComparisonState.Unknown;
+        }
     }
     public void buildTree(SapforPackage package_in) {
         //--
-        for (SapforTask task : tasks)
-            task.comparisonState = MatchState.Unknown;
-        //---
         root = new PackageSummary();
         root.count = tasks.size();
         root.errors_count = 0;
@@ -116,8 +118,25 @@ public class SapforPackage_json implements Serializable {
                     String.valueOf(task.sapfor_configuration_id)
             ).toFile());
             comparison_root.add(taskNode);
-            if (task.comparisonState.equals(MatchState.NotMatch))
+            if (task.comparisonState.equals(ComparisonState.NotMatch))
                 comparison_root.mismatches_count++;
         }
     }
+    public void getVersionsFiles(SapforPackage package_in) {
+        for (SapforTask task : tasks) {
+            File configurationRoot = Paths.get(
+                    package_in.getLocalWorkspace().getAbsolutePath(),
+                    String.valueOf(task.set_id),
+                    String.valueOf(task.sapfor_configuration_id)
+            ).toFile();
+            for (SapforVersion_json version_json : task.versions) {
+                version_json.task = task;
+                version_json.getFiles(configurationRoot);
+            }
+            for (SapforVersion_json version_json : task.variants) {
+                version_json.task = task;
+                version_json.getFiles(configurationRoot);
+            }
+        }
+    }
 }
diff --git a/src/TestingSystem/SAPFOR/Json/SapforVersionMatchState.java b/src/TestingSystem/SAPFOR/Json/SapforVersionMatchState.java
deleted file mode 100644
index 0f902488..00000000
--- a/src/TestingSystem/SAPFOR/Json/SapforVersionMatchState.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package TestingSystem.SAPFOR.Json;
-public enum SapforVersionMatchState {
-    Unknown,
-    Match, //версия совпадает
-    FilesQuantityMissmatch, //количество выходных файлов в версии не совпадает
-    CodeMissmatch //код файлов не совпадает.
-}
diff --git a/src/TestingSystem/SAPFOR/Json/SapforVersionState.java b/src/TestingSystem/SAPFOR/Json/SapforVersionState.java
index e81ea656..3934e78d 100644
--- a/src/TestingSystem/SAPFOR/Json/SapforVersionState.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforVersionState.java
@@ -2,6 +2,5 @@ package TestingSystem.SAPFOR.Json;
 import java.io.Serializable;
 public enum SapforVersionState implements Serializable {
     Empty,   //версия оказалась пуста.
-    Normal,  //версия построена
-    HasErrors //в журнале версии есть ошибки. то есть, не удалось построить следующую версию.
+    Normal  //версия построена
 }
diff --git a/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java b/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
index 1ee9b71e..18dd46db 100644
--- a/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
@@ -37,8 +37,8 @@ public class SapforVersion_json implements Serializable {
     public SapforTask task = null; //родная задача. Нужна для построения дерева версий.
     public db_project_info project = null;
     //--
-    public SapforVersionState state = SapforVersionState.Empty;
-    public SapforVersionMatchState matchState = SapforVersionMatchState.Unknown;
+    public SapforVersionState state = null;
+    public VersionComparisonState comparisonState = null;
     //--
     public SapforVersion_json(String version_in, String description_in) {
         version = version_in;
@@ -49,10 +49,10 @@ public class SapforVersion_json implements Serializable {
         description = description_in;
     }
 
-    public SapforVersionState init(File configurationRoot) {
+    public void getFiles(File configurationRoot) {
         //--
         state = SapforVersionState.Empty;
-        matchState = SapforVersionMatchState.Unknown;
+        comparisonState = VersionComparisonState.Unknown;
         //--
         String relativePath = Global.isWindows ? Utils.toW(version) : version;
         Home = Paths.get(configurationRoot.getAbsolutePath(), relativePath).toFile();
@@ -76,7 +76,6 @@ public class SapforVersion_json implements Serializable {
         parse_err = new ProjectFile(Paths.get(Home.getAbsolutePath(), Constants.data, Constants.parse_err_file).toFile());
         out = new ProjectFile(Paths.get(Home.getAbsolutePath(), Constants.data, Constants.out_file).toFile());
         err = new ProjectFile(Paths.get(Home.getAbsolutePath(), Constants.data, Constants.err_file).toFile());
-        return state;
     }
     public boolean isMatch(SapforVersion_json version_json) {
         if (!description.equals(version_json.description)) {
@@ -292,6 +291,6 @@ public class SapforVersion_json implements Serializable {
     }
     @Override
     public String toString() {
-        return Home.getName() + " : " + Utils.Brackets(description);
+        return Home.getName() + " : " + Utils.Brackets(description)+" файлы: " +files.size();
     }
 }
diff --git a/src/TestingSystem/SAPFOR/Json/VersionComparisonState.java b/src/TestingSystem/SAPFOR/Json/VersionComparisonState.java
new file mode 100644
index 00000000..3775bd12
--- /dev/null
+++ b/src/TestingSystem/SAPFOR/Json/VersionComparisonState.java
@@ -0,0 +1,6 @@
+package TestingSystem.SAPFOR.Json;
+public enum VersionComparisonState {
+    Unknown,
+    Match, //версия совпадает
+    NotMatch
+}
diff --git a/src/TestingSystem/SAPFOR/SapforTask/MatchState.java b/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java
similarity index 95%
rename from src/TestingSystem/SAPFOR/SapforTask/MatchState.java
rename to src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java
index 6d271a06..4613d2e6 100644
--- a/src/TestingSystem/SAPFOR/SapforTask/MatchState.java
+++ b/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java
@@ -4,7 +4,7 @@ import Common.UI.StatusEnum;
 import Common.UI.Themes.VisualiserFonts;
 
 import java.awt.*;
-public enum MatchState implements StatusEnum {
+public enum ComparisonState implements StatusEnum {
     Unknown,
     NotMatch,
     Match;
diff --git a/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java b/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
index b87d1306..6c353fa7 100644
--- a/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
+++ b/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
@@ -1,13 +1,13 @@
 package TestingSystem.SAPFOR.SapforTask;
 import Common.Constants;
 import Common.Database.DBObject;
-import Common.UI.UI;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
 import TestingSystem.SAPFOR.Json.SapforVersion_json;
+import TestingSystem.SAPFOR.Json.VersionComparisonState;
 import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackageTreeNode;
 import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTaskNode;
-import TestingSystem.SAPFOR.SapforTasksPackage.UI.VersionSummary;
+import TestingSystem.SAPFOR.SapforTasksPackage.UI.VersionNode;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.google.gson.annotations.Expose;
 import com.sun.org.glassfish.gmbal.Description;
@@ -55,7 +55,7 @@ public class SapforTask extends DBObject {
     @Expose
     public TaskState state = TaskState.Inactive;
     @Description("IGNORE")
-    public MatchState comparisonState = MatchState.Unknown;  //для сравнения. в обычном режиме всегда Unknown!
+    public ComparisonState comparisonState = ComparisonState.Unknown;  //для сравнения. в обычном режиме всегда Unknown!
     //--------------------------------------------------
     public String getUniqueKey() {
         return group_description + "_" + test_description + "_" + sapfor_configuration_id;
@@ -71,36 +71,6 @@ public class SapforTask extends DBObject {
     //-----------
     public SapforTask() {
     }
-    public DefaultMutableTreeNode getVersionsTree(File configurationRoot) {
-        VersionSummary root = null;
-        VersionSummary child = null;
-        VersionSummary parent = null;
-        //--
-        for (SapforVersion_json version_json : versions) {
-            version_json.task = this;
-            // System.out.println(version_json.version);
-            //-
-            version_json.init(configurationRoot);
-            child = new VersionSummary(version_json);
-            if (parent == null) {
-                root = child;
-                parent = child;
-            } else {
-                parent.add(child);
-                parent = child;
-            }
-            //-
-        }
-        if (parent != null) {
-            for (SapforVersion_json version_json : variants) {
-                version_json.task = this;
-                version_json.init(configurationRoot);
-                parent.add(new VersionSummary(version_json));
-            }
-        }
-        //--
-        return root;
-    }
     public void Reset() {
         state = TaskState.Inactive;
         versions.clear();
@@ -150,59 +120,46 @@ public class SapforTask extends DBObject {
         return res;
     }
     public void checkMatch(SapforTask task2) {
-        //todo Для каждого случая подобрать иконку (?)
-
         if (!state.equals(task2.state)) {
-            System.out.println("Не совпадение состояний задачи " + getUniqueKey());
-            //--
-            comparisonState = MatchState.NotMatch;
-            task2.comparisonState = MatchState.NotMatch;
-            return;
-            //--
+            comparisonState = ComparisonState.NotMatch;
+            task2.comparisonState = ComparisonState.NotMatch;
         }
         if ((versions.size() != task2.versions.size()) || (variants.size() != task2.variants.size())) {
-            System.out.println("Не совпадение количества версий в задаче " + getUniqueKey());
-            //--
-            comparisonState = MatchState.NotMatch;
-            task2.comparisonState = MatchState.NotMatch;
-            return;
-            //--
+            comparisonState = ComparisonState.NotMatch;
+            task2.comparisonState = ComparisonState.NotMatch;
         }
         LinkedHashMap<String, SapforVersion_json> versions1 = getSortedVersions();
         LinkedHashMap<String, SapforVersion_json> versions2 = task2.getSortedVersions();
         //---
         for (String name1 : versions1.keySet()) {
-            if (!versions2.containsKey(name1)) {
-                System.out.println("Не совпадение имен версий в задаче " + getUniqueKey());
+            System.out.println("current version="+Utils.Brackets(name1));
+            if (versions2.containsKey(name1)) {
+                SapforVersion_json version1 = versions1.get(name1);
+                SapforVersion_json version2 = versions2.get(name1);
+                //---
+                if (!version1.isMatch(version2)) {
+                    comparisonState = ComparisonState.NotMatch;
+                    task2.comparisonState = ComparisonState.NotMatch;
+                    version1.comparisonState = VersionComparisonState.NotMatch;
+                    version2.comparisonState = VersionComparisonState.NotMatch;
+                    //-
+                   // System.out.println(version1.comparisonState);
+                }else  {
+                    version1.comparisonState = VersionComparisonState.Match;
+                    version2.comparisonState = VersionComparisonState.Match;
+                    //-
+                   // System.out.println(version1.comparisonState);
+                }
+            } else {
+                comparisonState = ComparisonState.NotMatch;
+                task2.comparisonState = ComparisonState.NotMatch;
                 //--
-                comparisonState = MatchState.NotMatch;
-                task2.comparisonState = MatchState.NotMatch;
-                //--
-                return;
             }
         }
-        System.out.println("сравнение версий.");
         //--
-        for (String name1 : versions1.keySet()) {
-            System.out.println("version name=" + name1);
-            SapforVersion_json version1 = versions1.get(name1);
-            SapforVersion_json version2 = versions2.get(name1);
-            //---
-            if (!version1.isMatch(version2)) {
-                System.out.println("Не совпадение кода версий в задаче " + getUniqueKey());
-                //-
-                comparisonState = MatchState.NotMatch;
-                task2.comparisonState = MatchState.NotMatch;
-                //-
-                return;
-            }
-        }
-        comparisonState = MatchState.Match;
-        task2.comparisonState = MatchState.Match;
-        if (this.id==161){
-            UI.Info("!");
-            System.out.println(comparisonState+"/"+task2.comparisonState);
-            UI.Info("!!");
+        if (comparisonState.equals(ComparisonState.Unknown)) {
+            comparisonState = ComparisonState.Match;
+            task2.comparisonState = ComparisonState.Match;
         }
     }
     public Date getStartDate() {
@@ -228,6 +185,33 @@ public class SapforTask extends DBObject {
         return String.join("→", strings);
     }
     //---
+    public DefaultMutableTreeNode getVersionsTree() {
+        VersionNode root = null;
+        VersionNode child = null;
+        VersionNode parent = null;
+        //--
+        for (SapforVersion_json version_json : versions) {
+            version_json.task = this;
+            child = new VersionNode(version_json);
+            if (parent == null) {
+                root = child;
+                parent = child;
+            } else {
+                parent.add(child);
+                parent = child;
+            }
+            //-
+        }
+        if (parent != null) {
+            for (SapforVersion_json version_json : variants) {
+                version_json.task = this;
+                parent.add(new VersionNode(version_json));
+            }
+        }
+        //--
+        return root;
+    }
+    //---
     public DefaultMutableTreeNode getNode(File configurationRoot) {
         SapforPackageTreeNode res = new SapforTaskNode(this);
         //-
@@ -236,8 +220,7 @@ public class SapforTask extends DBObject {
         //-
         int total_versions_count = versions.size() + variants.size();
         DefaultMutableTreeNode versions_info = new DefaultMutableTreeNode("версии: " + total_versions_count);
-        versions_info.add(getVersionsTree(configurationRoot));
-        //--
+        versions_info.add(getVersionsTree());
         res.add(flags_info);
         res.add(passes_info);
         res.add(versions_info);
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTaskNode.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTaskNode.java
index 65c336b9..5e929e1d 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTaskNode.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTaskNode.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.SapforTasksPackage.UI;
-import TestingSystem.SAPFOR.SapforTask.MatchState;
+import TestingSystem.SAPFOR.SapforTask.ComparisonState;
 import TestingSystem.SAPFOR.SapforTask.SapforTask;
 public class SapforTaskNode extends SapforPackageTreeNode {
     public SapforTaskNode(SapforTask task_in) {
@@ -9,7 +9,7 @@ public class SapforTaskNode extends SapforPackageTreeNode {
     public String getImageKey() {
         SapforTask task = (SapforTask) getUserObject();
         //обычный режим
-        if (task.comparisonState == MatchState.Unknown) {
+        if (task.comparisonState == ComparisonState.Unknown) {
             return  task.state.toString();
         }
         //режим сравнения.
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
index cd89d985..ce2b94c2 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
@@ -12,7 +12,8 @@ public class SapforVersionsTreeCellRenderer extends StyledTreeCellRenderer {
             SapforPackageTreeNode node = (SapforPackageTreeNode) value;
             setForeground(tree.getForeground());
             setFont(getFont().deriveFont((float) 14.0));
-            setIcon(node.getIcon());
+            if (node.getIcon() != null)
+                setIcon(node.getIcon());
         }
         return this;
     }
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionNode.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionNode.java
new file mode 100644
index 00000000..fafa191b
--- /dev/null
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionNode.java
@@ -0,0 +1,22 @@
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
+import Common.UI.UI;
+import Common.Utils.Utils;
+import TestingSystem.SAPFOR.Json.SapforVersionState;
+import TestingSystem.SAPFOR.Json.SapforVersion_json;
+import TestingSystem.SAPFOR.Json.VersionComparisonState;
+public class VersionNode extends SapforPackageTreeNode {
+    public VersionNode(SapforVersion_json version_json) {
+        setUserObject(version_json);
+    }
+    @Override
+    public String getImageKey() {
+        SapforVersion_json version = (SapforVersion_json) getUserObject();
+        String res = "";
+        if (version.comparisonState.equals(VersionComparisonState.Unknown)||version.state.equals(SapforVersionState.Empty)){
+            res = version.state.toString();
+        }else {
+            res = version.comparisonState.toString()+version.state.toString();
+        }
+        return res;
+    }
+}
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionSummary.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionSummary.java
deleted file mode 100644
index 30b2b55a..00000000
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionSummary.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package TestingSystem.SAPFOR.SapforTasksPackage.UI;
-import TestingSystem.SAPFOR.Json.SapforVersionState;
-import TestingSystem.SAPFOR.Json.SapforVersion_json;
-public class VersionSummary extends SapforPackageTreeNode {
-    public VersionSummary(SapforVersion_json version_json) {
-        setUserObject(version_json);
-    }
-    @Override
-    public String getImageKey() {
-        return ((SapforVersion_json)getUserObject()).state.toString();
-    }
-}
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index 505703a7..208dc8f9 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -4,6 +4,7 @@ import Common.UI.Label.ShortLabel;
 import Common.UI.Menus_2023.VisualiserMenuBar;
 import Common.UI.UI;
 import Common.Utils.TextLog;
+import TestingSystem.SAPFOR.Json.SapforVersion_json;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import TestingSystem.SAPFOR.SapforTask.SapforTask;
 import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTasksPackageTree;
@@ -115,14 +116,14 @@ public class SapforPackagesComparisonForm {
         if (object.package_json == null) {
             try {
                 object.readJson();
+                object.package_json.getVersionsFiles(object);
                 object.package_json.buildTree(object);
                 //---
             } catch (Exception ex) {
                 ex.printStackTrace();
             }
-        } else {
-            object.package_json.DropComparison();
         }
+        object.package_json.DropComparison();
         //--
         showCommonTree();
     }
@@ -235,8 +236,16 @@ public class SapforPackagesComparisonForm {
                     task1.checkMatch(task2);
                     //--
                     ++i;
-                    //---
                 }
+                //--
+                for (SapforTask task1 : package1.package_json.tasks) {
+                    SapforTask task2 = package2.package_json.getTaskByKey(task1.getUniqueKey());
+                    //---
+                    for (SapforVersion_json version: task1.versions){
+                        System.out.println(version+":"+version.comparisonState);
+                    }
+                }
+                //---
                 package1.package_json.buildComparisonTree(package1);
                 package2.package_json.buildComparisonTree(package2);
             }
diff --git a/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
index f7f3a256..3f479a6c 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
@@ -112,7 +112,7 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
     @Override
     protected void showObject() {
         lObjectName.setText(object.toString());
-        lObjectName.setToolTipText(object.toString());
+        lObjectName.setToolTipText(object.Home.getName() + " : " + Utils.Brackets(object.description));
         cbFile.removeAllItems();
         for (ProjectFile file : object.files.values())
             cbFile.addItem(file);
diff --git a/src/icons/versions/MatchNormal.png b/src/icons/versions/MatchNormal.png
new file mode 100644
index 0000000000000000000000000000000000000000..0df635be68ce7fda339598644dbb0f3147eb5236
GIT binary patch
literal 1305
zcmV+!1?KvRP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&1g=R$K~zXfm6U6U
zRAm^)f9K3OJF_#hvln;0thps>mZ_QA1&PeGi>7n~DT|^Kf>HtrzZ88CyNDJ^ND_T1
z^G5q2=%RiIGN`u9OSKA`=(?-px-&bMo!hxj&p9(zh+_WX&wI}Mp7Y$^|MMtS0oRDl
zMmHU53o9BH)psD1O_I%?BdSMH6h(H-fC_4GesQhJSu{SDrsmFI_nHIvtg?sa^6R-J
zbOVRmKSftGEVIJVzJ26Oli8hfacmRM?Zd5{MALK$NTZ65s;YS6%_Tu|#{$BQiE9hs
z%kqAfr(ehRY<x=_+E($3`Y`3}0c`gGrmfKtN#KQADg1d9y=xkg_Hker@JffNn0Yk4
zF|cLpw-ax_>;DJvlko=+o?A`PDM=mW7YSfl{2sP?&tQ%GLSuDMvJ}IvO*GMrH<TsZ
zF_};_%Ah%#{*1w_(JrV`5idu%l!eCI>KAhroVL!fynijl@(37Cz$YRL*nZtxa;Kn&
zV`xonsPQ%;E#t5p6}u%t(MVFt97AzVNcl}7;Rsqtp`k&MN`!p{T)hGn&*Z+pR?<`a
zJ;>VU<E@L>HDyz9{}+<Igw<0dnk-yTqLEK(A{44hpa<8;p{X9G;{`TVHH2Zsag-Zt
z73jAH**o%MaCj-!oY_Fn@FB@s$|t-xGKX!G-wmAC;7S&Tl(i%*%5zbIEC{7qP9ELQ
zJSr7xj1y~05EaJaF~SiMWk{_B@Y=vemL7kZZ?gLXlNZsQ+Q-&2JL=9ICadGwb@O{f
z)kysdN!au7oHDMR7mnasLjT!ctvrsE6J~IXY(Upv%?zF?0g7JKE$4UeMRE^r+2pC-
zHT2|<1cryKVO~A9?jPqdTW9C=_ZidB9-RLR2iGZzvn*9{RCR>@vn{Lbuell>d9Kq9
z-V35-3-$YSk2sLF5=Vtnp5+Hui)vGBJoz!n{Q1DSfBwPLH<;Tzqwe%S@EkE#l#GTk
zD<c@?0!F2PX%uUeJ=1@eeV<k!<ctJelIl4qWw%m&{_t9MpZzKj5K__^iJKTGCS|bX
z{TlOh*JFG>@57qIOK_p@2h_q|QjJp>)aD0SxvneiSj7=ru87tX+Cta$s7QxQ(hqTK
z!*Sf$!de&D63L35Rdn}%EdhwtdLVwkPmFf)+p>MMg<ArLm*T?d?{IV9aztNBlG#{>
zWNLfZet*jUigbb&3ZZL4QGcZxA#VK2;)ZUtmWOI0)K!gbcW&l^w!7;k_bGQ@aoKXm
z+gEh%qbfpjtpa_?Bqz=$No9sf<@2O-8PfR-scf3_=^+MFLu7J8*k%E(Dy?bC6*wZo
zx*Z~+Fgxde#LU>#;LiOZUYztKi@O%qzqmXi%~M2%ol;&SnEQ?zWt?+>M_9)aHnK$7
z#G|Zdg8MTCJ4C)vq*%yeF&e$8J_jzME!@iP`#+({Yh;v?;GKDI)=#dC=1~)AowQPh
z${4A*jp-`Hy%b&5Q%qoh3Dp6vM+OyX(M3qUaVXkN^3O}Oj-7V-Nw~dtw@fXQ7iK+M
z-?=(^lW7k2OPfhfoiT%%ZBZG9sy`0{9L<#IFY5lCF@1asb0&<DiK*~6^ihlf&Rp{^
P00000NkvXXu0mjfo@8#N

literal 0
HcmV?d00001

diff --git a/src/icons/versions/NotMatchNormal.png b/src/icons/versions/NotMatchNormal.png
new file mode 100644
index 0000000000000000000000000000000000000000..89d2f8b025c69437da2da3b491c7e0be332b051d
GIT binary patch
literal 1407
zcmV-_1%UdAP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&1r$j{K~zXfb(LFa
z9Ay;8e>1zYJA2C}Y16b()0EI+W2jguh-j;{^sR!odP6~>6!p<J!3ROGg8Cp<t0;Xc
z`ceu)MSKxzrO?`oHmOZ$V$#bt&E7AQo%?uZcB`qz|8V%eIo~(mch3J@MhOJ0h=9`E
zSGelEtQ~%|tNVXcss*am8>F=~ilT_dibO$;)^Cr2tfjMS$>oQZX;(nIag}WL0zvx-
z%|@fET^Y93W`6NBS6j2BQ#x7<V%(HNP7`y^5_f+?btj1Xmx#HOEY;3nE;R^!Uy*?z
z@TuSUnpFB1aBs0teU0Hw&x&W=4a;CO$}CmS;CN@SoHzq|4}PqV=EX_0;W6~p>%eK^
z8|P_Tb>dno`p(g|kzM`J$_y;kXNbpsLW?^j^(B)2Cm5|}clA!xD}Q3h{#er{WiC-I
zU&AryN#q^$gdrXmDB3B`H@BkqZYQ357%ej<7F?%Qn_0<#0IPOPs9c~OJdeu*46Hgu
zsc@{jekTH9MN4Mn;C|F>zg)5o+f{LTduW*jjLIbxcN$f-(3842rjSS|!bDOsK%Rex
zpjG*Ugu5S48RW4&MIL`d<-q%=C|+5Me)mOkxomf52e%3nB-L4ZayFhX*2rm{Bot8<
zT*tyQYs6I_%k`sgR5gZaXK|HHcQO$89(Lmh3H>IH@&uPAuW)%*Vi-I{e`=2M^<$DB
z-OYc)6E92@-w<iZyam35%a_D;>u90pX<;apC6ntREt1J*B(xf8Ouf?pvo%jPd01v6
z<W@b&=;$D0V_Ssdw<N36Bx>)mWXJ`}5cod6yM*V|MH+avNH`BiyN+wuL@KyuH4-lz
ztqQ&+271nN0|M;&=MtX+BwrF5vy6{#W_)Z|*xV|N?4eJar#Sb0cmHj;cy3EBs}jgX
zfh!Wu9T}Z)taZedc~`vXy(w(k{}|A2%#ezGAq6}x20R_<cJAEC$jJI=uJ*o;8VnFC
z9-`G+#)9w4VJ-2fjMZ*PeK#@NO)Rt35z$%UyXZr)rT#H1VzeRbxt$~o>%Mv8O?vc0
zkp5C+Uvze<R6^4<^7*_F<Y7(i$67p2rT<e##ydvdnmd8o{DER>BMb2zkyoDQNnZ$X
zB|M%V;EOmSp6An+3K`YTaerb8FSE15fEji$4#~&&5$G>O2ZuO$@+8yK)14P3Mr`n9
zNze?+!p9hf(a{GEj%zVzjxgI=#Z)=VWHHBNInPw3mzhRC*V=0+dqWuNdJJtNv*rd&
zVJGk`VO7%Ft$rj)rVymwMo~LuX4>$|t8ehZhX<qg5b?epDEVFVCuik9@nfV5B#}J3
z$y}kp^mS=El`_S8ol>nrsa~O2EpfB7$U<?EN^KFxY7!5mG%X2%>kw}@rljr<<14*#
z>!K`tBe79sQ;dV}ZfAIS0JnIwQ+~oiAf{>w9cA$|jFH{w`Hi&8Lqe}9%|(-xjI+-E
znXT$^q!&i*AR!lC^ma4v>_Bx|r2Hy&ZjF@XCX~wMy+NP;os>sj63N4N65^F6uBqs`
zoRo?yiPaAKOK5>GB=xH%qLN!kACO$wEA6<z;a@MX7#o$CYizcTvMcs2wj$pPbXuI?
z8P2JDNvIAv`wIKEZKiKv1Io>bccl0JF83s)qU1Lwo_BD&<NT-dL_ej#GcYpGv1#jz
zk#3?;;_Ou^GfAtVjLDY%v}{yE0wPRS4EbAzj(LpV)ysqT49YnQe*q_2s?<ppHUj_v
N002ovPDHLkV1hyYm+b%m

literal 0
HcmV?d00001