From 0a2f2f05e15674f92ee0c4f1e596b3ea9c1e1754 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 25 Feb 2024 15:42:46 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D1=83=D0=B1=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BB=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BF=D0=BE=D1=80=D1=8F=D0=B4=D0=BA=D0=B0=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D1=87.=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=BE=20=D1=8D=D1=82=D0=BE=D0=B3=D0=BE=20=D0=B1=D1=83=D0=B4?=
 =?UTF-8?q?=D0=B5=D1=82=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=20=D0=BF?=
 =?UTF-8?q?=D0=BE=20=D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  8 ---
 .../SAPFOR/Json/SapforPackage_json.java       | 62 ++++++++-----------
 .../SAPFOR/SapforTask/SapforTask.java         | 22 +++----
 .../SapforTasksPackage/UI/SapforTaskNode.java |  4 +-
 .../UI/Main/SapforPackagesComparisonForm.java | 14 ++---
 5 files changed, 44 insertions(+), 66 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e1e1f333..a2940487 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,18 +7,10 @@
   </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/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/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/StateSummary.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java b/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
index e7429ea6..44c7ca71 100644
--- a/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
@@ -10,7 +10,7 @@ import com.google.gson.annotations.Expose;
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.Serializable;
 import java.nio.file.Paths;
-import java.util.LinkedHashMap;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Vector;
 public class SapforPackage_json implements Serializable {
@@ -34,38 +34,23 @@ public class SapforPackage_json implements Serializable {
     public PackageSummary root = null;
     public PackageComparisonSummary comparison_root = null;
     //--
-    public LinkedHashMap<String, SapforTask> allTasks = new LinkedHashMap<>(); //задачи по ключам (?)
-    public LinkedHashMap<TaskState, Vector<SapforTask>> sortedTasks = 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<>();
     //-- задачи, отсортированные для сравнения.
     // public LinkedHashMap<MatchState, LinkedHashMap<TaskState, LinkedHashMap<Integer, LinkedHashMap<String, Vector<SapforTask>>>>> comparisonSortedTasks = new LinkedHashMap<>();
-    public LinkedHashMap<MatchState, LinkedHashMap<TaskState, Vector<SapforTask>>> comparisonSortedTasks = new LinkedHashMap<>();
+   // public LinkedHashMap<MatchState, LinkedHashMap<TaskState, Vector<SapforTask>>> comparisonSortedTasks = new LinkedHashMap<>();
     //----
     //---------
     public void DropComparison() {
         //   UI.Info("DROP COMPARISON");
         comparison_root = null;
-        comparisonSortedTasks.clear();
+      //  comparisonSortedTasks.clear();
         for (SapforTask task: tasks)
-            task.matchState = MatchState.Unknown;
-    }
-    public void SortTasks() {
-        //-- СБРОС СРАВНЕНИЯ
-        for (SapforTask task: tasks)
-            task.matchState = MatchState.Unknown;
-        //--
-        sortedTasks.clear();
-        for (TaskState state : TaskState.values()) {
-            Vector<SapforTask> stateTasks = new Vector<>();
-            for (SapforTask task : tasks) {
-                if (task.state.equals(state))
-                    stateTasks.add(task);
-            }
-            if (!stateTasks.isEmpty())
-                sortedTasks.put(state, stateTasks);
-        }
+            task.comparisonState = MatchState.Unknown;
     }
     public void SortTasksForComparison() {
+        /*
         comparisonSortedTasks.clear();
         for (MatchState matchState : MatchState.values()) {
             LinkedHashMap<TaskState, Vector<SapforTask>> match_state_tasks = new LinkedHashMap<>();
@@ -82,28 +67,30 @@ public class SapforPackage_json implements Serializable {
             }
             comparisonSortedTasks.put(matchState, match_state_tasks);
         }
+         */
     }
     public void buildTree(SapforPackage package_in) {
+      //  tasks.sort(Comparator.comparing(SapforTask::getPK));
+        for (SapforTask task: tasks)
+            task.comparisonState = MatchState.Unknown;
+        //---
         root = new PackageSummary();
-        root.count = package_in.package_json.allTasks.size();
+        root.count = package_in.package_json.tasks.size();
+        root.errors_count=0;
         //--
-        for (TaskState state : sortedTasks.keySet()) {
-            Vector<SapforTask> tasks = sortedTasks.get(state);
-            //-
-            if (state.equals(TaskState.DoneWithErrors))
-                root.errors_count += tasks.size();
-            //-
-            for (SapforTask task : tasks) {
-                DefaultMutableTreeNode taskNode = task.getNode(Paths.get(
-                        package_in.getLocalWorkspace().getAbsolutePath(),
-                        String.valueOf(task.set_id),
-                        String.valueOf(task.sapfor_configuration_id)
-                ).toFile());
-                root.add(taskNode);
-            }
+        for (SapforTask task: tasks){
+            DefaultMutableTreeNode taskNode = task.getNode(Paths.get(
+                    package_in.getLocalWorkspace().getAbsolutePath(),
+                    String.valueOf(task.set_id),
+                    String.valueOf(task.sapfor_configuration_id)
+            ).toFile());
+            root.add(taskNode);
+            if (task.state.equals(TaskState.DoneWithErrors))
+                root.errors_count++;
         }
     }
     public void buildComparisonTree(SapforPackage package_in) {
+        /*
         comparison_root = new PackageComparisonSummary();
         comparison_root.count = package_in.package_json.allTasks.size();
         //--
@@ -127,5 +114,6 @@ public class SapforPackage_json implements Serializable {
             if (match_state.equals(MatchState.NotMatch))
                 comparison_root.mismatches_count+=count;
         }
+         */
     }
 }
diff --git a/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java b/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
index 9d214380..2516a5a3 100644
--- a/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
+++ b/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
@@ -54,7 +54,7 @@ public class SapforTask extends DBObject {
     @Expose
     public TaskState state = TaskState.Inactive;
     @Description("IGNORE")
-    public MatchState matchState = MatchState.Unknown;  //для сравнения. в обычном режиме всегда Unknown!
+    public MatchState comparisonState = MatchState.Unknown;  //для сравнения. в обычном режиме всегда Unknown!
     //--------------------------------------------------
     public String getUniqueKey() {
         return group_description + "_" + test_description + "_" + sapfor_configuration_id;
@@ -152,12 +152,12 @@ public class SapforTask extends DBObject {
         //todo Для каждого случая подобрать иконку (?)
         if (!state.equals(task2.state)) {
             System.out.println("Не совпадение состояний задачи " + getUniqueKey());
-            matchState = MatchState.NotMatch;
-            task2.matchState = MatchState.NotMatch;
+            comparisonState = MatchState.NotMatch;
+            task2.comparisonState = MatchState.NotMatch;
         } else if ((versions.size() != task2.versions.size())|| (variants.size() != task2.variants.size())) {
             System.out.println("Не совпадение количества версий в задаче " + getUniqueKey());
-            matchState = MatchState.NotMatch;
-            task2.matchState = MatchState.NotMatch;
+            comparisonState = MatchState.NotMatch;
+            task2.comparisonState = MatchState.NotMatch;
         }  else {
             LinkedHashMap<String, SapforVersion_json> versions1 = getSortedVersions();
             LinkedHashMap<String, SapforVersion_json> versions2 = task2.getSortedVersions();
@@ -165,8 +165,8 @@ public class SapforTask extends DBObject {
             for (String name1 : versions1.keySet()) {
                 if (!versions2.containsKey(name1)) {
                     System.out.println("Не совпадение имен версий в задаче " + getUniqueKey());
-                    matchState = MatchState.NotMatch;
-                    task2.matchState = MatchState.NotMatch;
+                    comparisonState = MatchState.NotMatch;
+                    task2.comparisonState = MatchState.NotMatch;
                     return;
                 }
             }
@@ -179,13 +179,13 @@ public class SapforTask extends DBObject {
                 //---
                 if (!version1.isMatch(version2)) {
                     System.out.println("Не совпадение версий в задаче " + getUniqueKey());
-                    matchState = MatchState.NotMatch;
-                    task2.matchState = MatchState.NotMatch;
+                    comparisonState = MatchState.NotMatch;
+                    task2.comparisonState = MatchState.NotMatch;
                     return;
                 }
             }
-            matchState = MatchState.Match;
-            task2.matchState = MatchState.Match;
+            comparisonState = MatchState.Match;
+            task2.comparisonState = MatchState.Match;
         }
     }
     public Date getStartDate() {
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTaskNode.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTaskNode.java
index d39dd0a5..65c336b9 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTaskNode.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTaskNode.java
@@ -9,12 +9,12 @@ public class SapforTaskNode extends SapforPackageTreeNode {
     public String getImageKey() {
         SapforTask task = (SapforTask) getUserObject();
         //обычный режим
-        if (task.matchState == MatchState.Unknown) {
+        if (task.comparisonState == MatchState.Unknown) {
             return  task.state.toString();
         }
         //режим сравнения.
         else {
-            return task.matchState.toString()+task.state.toString();
+            return task.comparisonState.toString()+task.state.toString();
         }
     }
 }
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index aa5e434b..a767d879 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -116,12 +116,6 @@ public class SapforPackagesComparisonForm {
         if (object.package_json == null) {
             try {
                 object.readJson();
-                object.package_json.tasks.sort(Comparator.comparing(SapforTask::getUniqueKey));
-                for (SapforTask task : object.package_json.tasks)
-                    object.package_json.allTasks.put(task.getUniqueKey(), task);
-                //---
-                object.package_json.SortTasks(); //по состояниям конфигурациям и группам
-                //---
                 object.package_json.buildTree(object);
                 //---
             } catch (Exception ex) {
@@ -198,16 +192,18 @@ public class SapforPackagesComparisonForm {
                     package1 = object;
                     package2 = slave.object;
                     //--
-                    if (package1.package_json.allTasks.size() != package2.package_json.allTasks.size()) {
+                    if (package1.package_json.tasks.size() != package2.package_json.tasks.size()) {
                         Log.Writeln_("Количество задач в пакетах не совпадает!");
                         return false;
                     }
                     //--
-                    for (String key1 : package1.package_json.allTasks.keySet()) {
+                    /*
+                    for (String key1 : package1.package_json.tasks) {
                         if (!package2.package_json.allTasks.containsKey(key1)) {
                             Log.Writeln_("Задача эталона " + key1 + "не найдена в сравниваемом пакете!");
                         }
                     }
+                     */
                     return Log.isEmpty();
                 }
                 return false;
@@ -233,6 +229,7 @@ public class SapforPackagesComparisonForm {
             }
             @Override
             protected void body() throws Exception {
+                /*
                 System.out.println(package1.package_json.allTasks.size());
                 System.out.println(package2.package_json.allTasks.size());
 
@@ -254,6 +251,7 @@ public class SapforPackagesComparisonForm {
                 //-
                 package1.package_json.buildComparisonTree(package1);
                 package2.package_json.buildComparisonTree(package2);
+                 */
             }
             @Override
             protected boolean validate() {