diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 60a56686..0597abb2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,8 +9,6 @@
-
-
diff --git a/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java b/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
index 2df7c09c..5e78bfbf 100644
--- a/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
@@ -1,5 +1,4 @@
package TestingSystem.SAPFOR.Json;
-import Common.UI.UI;
import GlobalData.Tasks.TaskState;
import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import TestingSystem.SAPFOR.SapforTask.MatchState;
@@ -11,6 +10,8 @@ import com.google.gson.annotations.Expose;
import javax.swing.tree.DefaultMutableTreeNode;
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 {
@@ -39,6 +40,23 @@ public class SapforPackage_json implements Serializable {
//--
@Expose
public List tasks = new Vector<>();
+ //---
+ public void sortTasks() {
+ tasks.sort(new Comparator() {
+ @Override
+ public int compare(SapforTask o1, SapforTask o2) {
+ return Integer.compare(o1.state.ordinal(), o2.state.ordinal());
+ }
+ });
+ }
+ public void sortTasksForComparison() {
+ tasks.sort(new Comparator() {
+ @Override
+ public int compare(SapforTask o1, SapforTask o2) {
+ return Integer.compare(o1.comparisonState.ordinal(), o2.comparisonState.ordinal());
+ }
+ });
+ }
public boolean containsKey(String key) {
for (SapforTask task : tasks) {
if (task.getUniqueKey().equals(key))
@@ -59,7 +77,6 @@ public class SapforPackage_json implements Serializable {
//---------
public void DropComparison() {
comparison_root = null;
- UI.Info("DROP COMPARISON");
for (SapforTask task : tasks)
task.comparisonState = MatchState.Unknown;
}
@@ -72,6 +89,8 @@ public class SapforPackage_json implements Serializable {
root.count = tasks.size();
root.errors_count = 0;
//--
+ sortTasks();
+ //--
for (SapforTask task : tasks) {
DefaultMutableTreeNode taskNode = task.getNode(Paths.get(
package_in.getLocalWorkspace().getAbsolutePath(),
@@ -84,13 +103,13 @@ public class SapforPackage_json implements Serializable {
}
}
public void buildComparisonTree(SapforPackage package_in) {
- System.out.println(package_in.id);
comparison_root = new PackageComparisonSummary();
comparison_root.count = tasks.size();
comparison_root.mismatches_count = 0;
//--
+ sortTasksForComparison();
+ //--
for (SapforTask task : tasks) {
- // System.out.println(task.getUniqueKey()+":"+task.comparisonState);
DefaultMutableTreeNode taskNode = task.getNode(Paths.get(
package_in.getLocalWorkspace().getAbsolutePath(),
String.valueOf(task.set_id),
@@ -100,6 +119,5 @@ public class SapforPackage_json implements Serializable {
if (task.comparisonState.equals(MatchState.NotMatch))
comparison_root.mismatches_count++;
}
- System.out.println("====");
}
}
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index 842b050b..505703a7 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -5,7 +5,6 @@ import Common.UI.Menus_2023.VisualiserMenuBar;
import Common.UI.UI;
import Common.Utils.TextLog;
import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-import TestingSystem.SAPFOR.SapforTask.MatchState;
import TestingSystem.SAPFOR.SapforTask.SapforTask;
import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTasksPackageTree;
import Visual_DVM_2021.Passes.PassCode_2021;
@@ -121,7 +120,7 @@ public class SapforPackagesComparisonForm {
} catch (Exception ex) {
ex.printStackTrace();
}
- }else {
+ } else {
object.package_json.DropComparison();
}
//--
@@ -229,51 +228,15 @@ public class SapforPackagesComparisonForm {
}
@Override
protected void body() throws Exception {
- System.out.println(package1.package_json.tasks.size());
- System.out.println(package2.package_json.tasks.size());
- //------------------------
- for (SapforTask task1: package1.package_json.tasks){
-
- }
-
//теперь сравниваем задачи
int i = 1;
for (SapforTask task1 : package1.package_json.tasks) {
- if (task1.id==161){
- UI.Info("161");
- SapforTask task2 = package2.package_json.getTaskByKey(task1.getUniqueKey());
- task1.comparisonState=MatchState.Match;
- task2.comparisonState=MatchState.Match;
- UI.Info(String.valueOf(task2.id));
- }
- // System.out.println(i + "=" + task1.getUniqueKey());
SapforTask task2 = package2.package_json.getTaskByKey(task1.getUniqueKey());
- task1.comparisonState=MatchState.Match;
- task2.comparisonState=MatchState.Match;
- // task1.checkMatch(task2);
+ task1.checkMatch(task2);
//--
++i;
//---
-
-
}
- System.out.println("i="+i);
-
- //--
- int unknown_1 = 0;
- for (SapforTask task: package1.package_json.tasks){
- if (task.comparisonState.equals(MatchState.Unknown))
- unknown_1++;
- }
- System.out.println("UNknown1="+unknown_1);
- //--
- int unknown_2 = 0;
- for (SapforTask task: package2.package_json.tasks){
- if (task.comparisonState.equals(MatchState.Unknown))
- unknown_2++;
- }
- System.out.println("UNknown2="+unknown_2); //??!!
- //--
package1.package_json.buildComparisonTree(package1);
package2.package_json.buildComparisonTree(package2);
}