no message

src/SapforTestingSystem/Json/SapforTasksResults_json.java

@@ -3,6 +3,7 @@ import GlobalData.Tasks.TaskState;
 import SapforTestingSystem.SapforTask.SapforTask;
 import com.google.gson.annotations.Expose;
 
+import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Vector;
@@ -13,6 +14,15 @@ public class SapforTasksResults_json {
     public long EndDate = 0;
     @Expose
     public List<SapforTask> tasks = new Vector<>();
+    //задачи по ключам.
+    public LinkedHashMap<String, SapforTask> sortedTasks = new LinkedHashMap<>();
+    public void SortTasks() {
+        //--->>>
+        tasks.sort(Comparator.comparing(SapforTask::getUniqueKey));
+        //--->>>
+        for (SapforTask task : tasks)
+            sortedTasks.put(task.getUniqueKey(), task);
+    }
     //это для емейла. Не трогать.
     public LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortTasksByStatesConfigurationsAndGroups() {
         LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> res = new LinkedHashMap<>();

src/SapforTestingSystem/Json/SapforVersion_json.java

@@ -2,6 +2,7 @@ package SapforTestingSystem.Json;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
+import ProjectData.Files.FileState;
 import ProjectData.Files.FileType;
 import ProjectData.Files.ProjectFile;
 import com.google.gson.annotations.Expose;
@@ -9,6 +10,7 @@ import com.google.gson.annotations.Expose;
 import java.io.File;
 import java.io.Serializable;
 import java.nio.file.Paths;
+import java.util.LinkedHashMap;
 import java.util.Vector;
 public class SapforVersion_json implements Serializable {
     @Expose
@@ -18,7 +20,7 @@ public class SapforVersion_json implements Serializable {
     public boolean success = true;
     //поля для отображения деревьев.
     public File Home = null;
-    public Vector<ProjectFile> files = null;
+    public LinkedHashMap<String, ProjectFile> files = new LinkedHashMap<>();
     //-
     public SapforVersion_json(String version_in, String description_in) {
         version = version_in;
@@ -35,15 +37,17 @@ public class SapforVersion_json implements Serializable {
     public void init(File configurationRoot) {
         String relativePath = Global.isWindows ? Utils.toW(version) : version;
         Home = Paths.get(configurationRoot.getAbsolutePath(), relativePath).toFile();
-        files = new Vector<>();
+        files = new LinkedHashMap<>();
         //--
         File[] files_ = Home.listFiles();
         if (files_ != null) {
             for (File file : files_) {
                 if (file.isFile()) {
                     ProjectFile projectFile = new ProjectFile(file);
-                    if (!projectFile.fileType.equals(FileType.forbidden)) {
-                        files.add(projectFile);
+                    if (!projectFile.fileType.equals(FileType.forbidden) &&
+                            !projectFile.state.equals(FileState.Excluded)
+                    ) {
+                        files.put(projectFile.file.getName(), projectFile);
                     }
                 }
             }
@@ -57,10 +61,25 @@ public class SapforVersion_json implements Serializable {
         //--
         for (File file : out_files) {
             if (file.exists()) {
-               // System.out.println(file.getAbsolutePath());
+                // System.out.println(file.getAbsolutePath());
                 ProjectFile projectFile = new ProjectFile(file);
-                files.add(projectFile);
+                files.put(projectFile.file.getName(), projectFile);
             }
         }
     }
+    public boolean isMatch(SapforVersion_json version_json) {
+        if (!version.equals(version_json.version)) {
+            System.out.println("не совпадение имени версии");
+            return false;
+        }
+        if (description.equals(version_json.description)) {
+            System.out.println("не совпадение описания версии");
+            return false;
+        }
+        if (files.size() != version_json.files.size()) {
+            System.out.println("не совпадение количества файлов");
+            return false;
+        }
+        return false;
+    }
 }

src/SapforTestingSystem/SapforTask/SapforTask.java

@@ -52,7 +52,11 @@ public class SapforTask extends DBObject {
     public Vector<SapforVersion_json> variants = new Vector<>();
     //----------
     @Description("IGNORE")
-    public MatchState match = MatchState.Match;
+    public MatchState match = MatchState.Unknown;
+    //-----------
+    public String getUniqueKey(){
+        return sapfor_configuration_id+"_"+group_description+"_"+test_description;
+    }
     //-----------
     public SapforTask() {
     }

src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java

@@ -59,5 +59,4 @@ public class SapforTasksPackage extends nDBObject {
     //---
     @Description("IGNORE")
     public SapforTasksResults_json results = null;
-    //---
 }

src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java

@@ -25,6 +25,7 @@ public class SapforTasksPackageInterface {
         try {
             res = (SapforTasksResults_json) Utils.jsonFromFile(json_file,
                     SapforTasksResults_json.class);
+            res.SortTasks();
         } catch (Exception ex) {
             ex.printStackTrace();
         }