промежуточный. начал дерево отображения пакета версий

src/SapforTestingSystem/Json/SapforTasksResults_json.java

@@ -13,7 +13,7 @@ public class SapforTasksResults_json {
     public long EndDate = 0;
     @Expose
     public List<SapforTask> tasks = new Vector<>();
-    public LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> getSortedTasks() {
+    public LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortTasksByStatesFlagsAndGroups() {
         LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> res = new LinkedHashMap<>();
         //рассортировать задачи по конфигурациям.
         for (TaskState state : TaskState.values()) {
@@ -42,4 +42,27 @@ public class SapforTasksResults_json {
         }
         return res;
     }
+    //--
+    public LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> sortTasksFlagsAndGroups() {
+        LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> res = new LinkedHashMap<>();
+        //рассортировать задачи по конфигурациям.
+        for (SapforTask task : tasks) {
+            LinkedHashMap<String, Vector<SapforTask>> groups_tasks = null;
+            if (res.containsKey(task.flags)) {
+                groups_tasks = res.get(task.flags);
+            } else {
+                groups_tasks = new LinkedHashMap<>();
+                res.put(task.flags, groups_tasks);
+            }
+            Vector<SapforTask> tasks = null;
+            if (groups_tasks.containsKey(task.group_description)) {
+                tasks = groups_tasks.get(task.group_description);
+            } else {
+                tasks = new Vector<>();
+                groups_tasks.put(task.group_description, tasks);
+            }
+            tasks.add(task);
+        }
+        return res;
+    }
 }

src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java

@@ -2,36 +2,61 @@ package SapforTestingSystem.SapforTasksPackage;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
-import SapforTestingSystem.Json.SapforConfiguration_json;
-import SapforTestingSystem.Json.SapforTasksPackage_json;
 import SapforTestingSystem.Json.SapforTasksResults_json;
+import SapforTestingSystem.SapforTask.SapforTask;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.File;
+import java.nio.file.Paths;
+import java.util.LinkedHashMap;
+import java.util.Vector;
 public class SapforTasksPackageInterface {
     public static File getPackageArchive(SapforTasksPackage package_in) {
         return new File(Global.SapforPackagesDirectory, package_in.id + ".zip");
     }
-    public static DefaultMutableTreeNode getTree(SapforTasksPackage package_in) throws Exception {
-        SapforTasksPackage_json package_json = getJson(package_in);
-        SapforTasksResults_json results = getResults(package_in);
+    public static DefaultMutableTreeNode getTree(SapforTasksPackage package_in) {
+        SapforTasksResults_json results_json = getLocalResults(package_in);
+        //--  флаги                 группы
+        LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> sortedTasks = results_json.sortTasksFlagsAndGroups();
+        //--
         DefaultMutableTreeNode root = new DefaultMutableTreeNode(package_in.id);
-        for (SapforConfiguration_json configuration : package_json.configurations) {
-            DefaultMutableTreeNode node = new DefaultMutableTreeNode(configuration.flags);
-
-
-            root.add(node);
+        for (String flags : sortedTasks.keySet()) {
+            DefaultMutableTreeNode flagsNode = new DefaultMutableTreeNode(flags);
+            //---
+            LinkedHashMap<String, Vector<SapforTask>> tasksByGroups = sortedTasks.get(flags);
+            for (String group : tasksByGroups.keySet()) {
+                DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(group);
+                //--
+                Vector<SapforTask> tasks = tasksByGroups.get(group);
+                for (SapforTask task : tasks) {
+                    DefaultMutableTreeNode taskNode = new DefaultMutableTreeNode(task.test_description);
+                    groupNode.add(taskNode);
+                }
+                flagsNode.add(groupNode);
+            }
+            //---
+            root.add(flagsNode);
         }
         return root;
     }
-    public static SapforTasksPackage_json getJson(SapforTasksPackage package_in) throws Exception {
-        File json_file = new File(package_in.workspace, Constants.package_json);
-        return (SapforTasksPackage_json) Utils.jsonFromFile(json_file,
-                SapforTasksPackage_json.class);
+    public static File getLocalWorkspace(SapforTasksPackage package_in) {
+        return new File(Global.SapforPackagesDirectory, package_in.id);
     }
-    public static SapforTasksResults_json getResults(SapforTasksPackage package_in) throws Exception {
-        File json_file = new File(package_in.workspace, Constants.results_json);
-        return (SapforTasksResults_json) Utils.jsonFromFile(json_file,
-                SapforTasksResults_json.class);
+    public static SapforTasksResults_json getLocalResults(SapforTasksPackage package_in) {
+        File json_file = new File(getLocalWorkspace(package_in), Constants.results_json);
+        SapforTasksResults_json res = null;
+        try {
+            res = (SapforTasksResults_json) Utils.jsonFromFile(json_file,
+                    SapforTasksResults_json.class);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return res;
+    }
+    public static File getLoadedSign(SapforTasksPackage package_in) {
+        return Paths.get(Global.SapforPackagesDirectory.getAbsolutePath(), package_in.id, Constants.LOADED).toFile();
+    }
+    public static boolean isLoaded(SapforTasksPackage package_in) {
+        return getLoadedSign(package_in).exists();
     }
 }

src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java

@@ -1,3 +1,22 @@
 package SapforTestingSystem.SapforTasksPackage;
-public class SapforTasksPackageTree {
-}
+import Common.UI.Trees.DataTree;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreePath;
+public class SapforTasksPackageTree extends DataTree {
+    public SapforTasksPackageTree(DefaultMutableTreeNode root_in) {
+        super(root_in);
+        setRootVisible(false);
+        CollapseAll();
+    }
+    @Override
+    protected int getStartLine() {
+        return 1;
+    }
+    @Override
+    public void SelectionAction(TreePath path) {}
+    @Override
+    public void LeftMouseAction2() {
+
+    }
+}

src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java

@@ -180,7 +180,7 @@ public class SapforTasksPackageSupervisor {
         if (results_json_file.exists()) {
             SapforTasksResults_json results_json = (SapforTasksResults_json) Utils.jsonFromFile(results_json_file, SapforTasksResults_json.class);
             summary_lines.add("Всего задач: " + results_json.tasks.size());
-            LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = results_json.getSortedTasks();
+            LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = results_json.sortTasksByStatesFlagsAndGroups();
             //--
             for (TaskState state : sortedTasks.keySet()) {
                 LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByFlags = sortedTasks.get(state);