промежуточный. в процессе поиска бага со сравнением.

.idea/workspace.xml

@@ -7,21 +7,19 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTaskNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/PackageComparisonSummary.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/versions/MatchDone.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/versions/MatchDoneWithErrors.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/versions/NotMatchDone.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/versions/NotMatchDoneWithErrors.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/versions/UnknownDone.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/versions/UnknownDoneWithErrors.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/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/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/ConfigurationSummary.java" beforeDir="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/GroupSummary.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/StateSummary.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/MatchesSummary.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/TestingSystem/SAPFOR/SapforTasksPackage/UI/PackageSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/PackageSummary.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionSummary.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/icons/versions/DoneStateSummary.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/icons/versions/Done.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/icons/versions/ErrorsStateSummary.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/icons/versions/DoneWithErrors.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/icons/versions/Group.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/icons/versions/Package.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/icons/versions/Unknown.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/icons/versions/Unknown.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/icons/versions/UnknownStateSummary.png" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

src/TestingSystem/SAPFOR/Json/SapforPackage_json.java

@@ -3,6 +3,7 @@ import GlobalData.Tasks.TaskState;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import TestingSystem.SAPFOR.SapforTask.MatchState;
 import TestingSystem.SAPFOR.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.SapforTasksPackage.UI.PackageComparisonSummary;
 import TestingSystem.SAPFOR.SapforTasksPackage.UI.PackageSummary;
 import com.google.gson.annotations.Expose;
 
@@ -31,9 +32,9 @@ public class SapforPackage_json implements Serializable {
     public List<SapforTask> tasks = new Vector<>();
     //-
     public PackageSummary root = null;
-    public PackageSummary comparison_root = null;
+    public PackageComparisonSummary comparison_root = null;
     //--
-    public LinkedHashMap<String, SapforTask> allTasks = new LinkedHashMap<>();
+    public LinkedHashMap<String, SapforTask> allTasks = new LinkedHashMap<>(); //задачи по ключам (?)
     public LinkedHashMap<TaskState, Vector<SapforTask>> sortedTasks = new LinkedHashMap<>();
     // public LinkedHashMap<TaskState, LinkedHashMap<Integer, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = new LinkedHashMap<>();
     //-- задачи, отсортированные для сравнения.
@@ -45,12 +46,12 @@ public class SapforPackage_json implements Serializable {
         //   UI.Info("DROP COMPARISON");
         comparison_root = null;
         comparisonSortedTasks.clear();
-        for (SapforTask task : allTasks.values())
+        for (SapforTask task: tasks)
-            task.matchState = MatchState.NotMatch;
+            task.matchState = MatchState.Unknown;
     }
     public void SortTasks() {
         //-- СБРОС СРАВНЕНИЯ
-        for (SapforTask task: allTasks.values())
+        for (SapforTask task: tasks)
             task.matchState = MatchState.Unknown;
         //--
         sortedTasks.clear();
@@ -103,19 +104,16 @@ public class SapforPackage_json implements Serializable {
         }
     }
     public void buildComparisonTree(SapforPackage package_in) {
-        comparison_root = new PackageSummary();
+        comparison_root = new PackageComparisonSummary();
         comparison_root.count = package_in.package_json.allTasks.size();
         //--
         for (MatchState match_state : comparisonSortedTasks.keySet()) {
-           // MatchesSummary matchesSummary = new MatchesSummary(match_state);
+            int count = 0;
             LinkedHashMap<TaskState, Vector<SapforTask>> task_states = comparisonSortedTasks.get(match_state);
             //---
             for (TaskState state : task_states.keySet()) {
                 Vector<SapforTask> tasks = task_states.get(state);
                 //-
-                if (state.equals(TaskState.DoneWithErrors))
-                    comparison_root.errors_count += tasks.size();
-                //-
                 for (SapforTask task : tasks) {
                     DefaultMutableTreeNode taskNode = task.getNode(Paths.get(
                             package_in.getLocalWorkspace().getAbsolutePath(),
@@ -123,9 +121,11 @@ public class SapforPackage_json implements Serializable {
                             String.valueOf(task.sapfor_configuration_id)
                     ).toFile());
                     comparison_root.add(taskNode);
+                    count++;
                 }
             }
-
+            if (match_state.equals(MatchState.NotMatch))
+                comparison_root.mismatches_count+=count;
         }
     }
 }

src/TestingSystem/SAPFOR/SapforTask/SapforTask.java

@@ -149,19 +149,24 @@ public class SapforTask extends DBObject {
         return res;
     }
     public void checkMatch(SapforTask task2) {
+        //todo Для каждого случая подобрать иконку (?)
         if (!state.equals(task2.state)) {
-            System.out.println("Не совпадение цепочки версий в задаче " + getUniqueKey());
+            System.out.println("Не совпадение состояний задачи " + getUniqueKey());
-        } else if (versions.size() != task2.versions.size()) {
+            matchState = MatchState.NotMatch;
-            System.out.println("Не совпадение длины цепочки версий в задаче " + getUniqueKey());
+            task2.matchState = MatchState.NotMatch;
-        } else if (variants.size() != task2.variants.size()) {
+        } else if ((versions.size() != task2.versions.size())|| (variants.size() != task2.variants.size())) {
-            System.out.println("Не совпадение длины цепочки вариантов в задаче " + getUniqueKey());
+            System.out.println("Не совпадение количества версий в задаче " + getUniqueKey());
-        } else {
+            matchState = MatchState.NotMatch;
+            task2.matchState = MatchState.NotMatch;
+        }  else {
             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());
+                    matchState = MatchState.NotMatch;
+                    task2.matchState = MatchState.NotMatch;
                     return;
                 }
             }
@@ -174,6 +179,8 @@ public class SapforTask extends DBObject {
                 //---
                 if (!version1.isMatch(version2)) {
                     System.out.println("Не совпадение версий в задаче " + getUniqueKey());
+                    matchState = MatchState.NotMatch;
+                    task2.matchState = MatchState.NotMatch;
                     return;
                 }
             }
@@ -190,7 +197,7 @@ public class SapforTask extends DBObject {
     @Override
     public String toString() {
         return
-                "группа " + Utils.Brackets(group_description) + " тест " + Utils.Brackets(test_description) + " конфигурация " + Utils.Brackets(sapfor_configuration_id);
+                "#"+id+" группа " + Utils.Brackets(group_description) + " тест " + Utils.Brackets(test_description) + " конфигурация " + Utils.Brackets(sapfor_configuration_id);
         //   getUniqueKey();
     }
     public String getPassesInfo() {

src/TestingSystem/SAPFOR/SapforTasksPackage/UI/PackageComparisonSummary.java

@@ -0,0 +1,15 @@
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
+public class PackageComparisonSummary  extends SapforPackageTreeNode {
+    public int count = 0;
+    public int mismatches_count = 0;
+    @Override
+    public String getImageKey() {
+        return "Package";
+    }
+    public PackageComparisonSummary() {
+    }
+    @Override
+    public String toString() {
+        return "всего задач : " + count + ", различий : " + mismatches_count;
+    }
+}

src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTaskNode.java

@@ -9,19 +9,12 @@ public class SapforTaskNode extends SapforPackageTreeNode {
     public String getImageKey() {
         SapforTask task = (SapforTask) getUserObject();
         //обычный режим
-     //   if (task.matchState == MatchState.Unknown) {
+        if (task.matchState == MatchState.Unknown) {
-            switch (task.state) {
+            return  task.state.toString();
-                case Done:
+        }
-                    return "Done";
-                case DoneWithErrors:
-                    return "DoneWithErrors";
-                default:
-                    return "Unknown";
-            }
-      //  }
         //режим сравнения.
-     //   else {
+        else {
-     //       return "Unknown";
+            return task.matchState.toString()+task.state.toString();
-     //   }
+        }
     }
 }

src/TestingSystem/SAPFOR/SapforTasksPackage/UI/StateSummary.java

@@ -1,24 +0,0 @@
-package TestingSystem.SAPFOR.SapforTasksPackage.UI;
-import GlobalData.Tasks.TaskState;
-public class StateSummary extends SapforPackageTreeNode {
-    public TaskState state;
-    public int count = 0;
-    public StateSummary(TaskState state_in) {
-        state = state_in;
-    }
-    @Override
-    public String toString() {
-        return state.getDescription() + " : " + count;
-    }
-    @Override
-    public String getImageKey() {
-        switch (state) {
-            case Done:
-                return "DoneStateSummary";
-            case DoneWithErrors:
-                return "ErrorsStateSummary";
-            default:
-                return "UnknownStateSummary";
-        }
-    }
-}

src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java

@@ -235,6 +235,8 @@ public class SapforPackagesComparisonForm {
             protected void body() throws Exception {
                 System.out.println(package1.package_json.allTasks.size());
                 System.out.println(package2.package_json.allTasks.size());
+
+
                 //теперь сравниваем задачи
                 int i = 1;
                 for (String key1 : package1.package_json.allTasks.keySet()) {