no message

2023-10-29 03:07:30 +03:00
parent 46d5647294
commit a501f69910
4 changed files with 33 additions and 68 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,8 +9,8 @@
    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksResults_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
--- a/src/SapforTestingSystem/Json/SapforTasksResults_json.java
+++ b/src/SapforTestingSystem/Json/SapforTasksResults_json.java
@@ -13,22 +13,16 @@ public class SapforTasksResults_json {
    public long EndDate = 0;
    @Expose
    public List<SapforTask> tasks = new Vector<>();
-    /*
-    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()) {
-            LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByFlags = new LinkedHashMap<>();
-            res.put(state, tasksByFlags);
+    public LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> sortTasksByConfigurationsAndGroups() {
+        LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = new LinkedHashMap<>();
        //--
        for (SapforTask task : tasks) {
-                if (task.state.equals(state)) {
            LinkedHashMap<String, Vector<SapforTask>> groups_tasks = null;
-                    if (tasksByFlags.containsKey(task.flags)) {
-                        groups_tasks = tasksByFlags.get(task.flags);
+            if (tasksByConfigurations.containsKey(task.sapfor_configuration_id)) {
+                groups_tasks = tasksByConfigurations.get(task.sapfor_configuration_id);
            } else {
                groups_tasks = new LinkedHashMap<>();
-                        tasksByFlags.put(task.flags, groups_tasks);
+                tasksByConfigurations.put(task.sapfor_configuration_id, groups_tasks);
            }
            Vector<SapforTask> tasks = null;
            if (groups_tasks.containsKey(task.group_description)) {
@@ -39,32 +33,17 @@ public class SapforTasksResults_json {
            }
            tasks.add(task);
        }
+        for (String configuration_id:  tasksByConfigurations.keySet()){
+            System.out.println(configuration_id);
+            LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
+            for (String group: groups_tasks.keySet()){
+                System.out.println(group);
+                for (SapforTask task: groups_tasks.get(group)){
+                    System.out.println(task.id);
                }
            }
-        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;
+        return tasksByConfigurations;
    }
    //--
    public LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortTasksByStatesConfigurationsAndGroups() {
@@ -96,5 +75,4 @@ public class SapforTasksResults_json {
        }
        return res;
    }
-
 }
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
@@ -5,7 +5,6 @@ import Common.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileType;
 import SapforTestingSystem.Json.SapforTasksResults_json;
-import SapforTestingSystem.Json.SapforVersion_json;
 import SapforTestingSystem.SapforTask.SapforTask;

 import javax.swing.tree.DefaultMutableTreeNode;
@@ -41,38 +40,24 @@ public class SapforTasksPackageInterface {
    public static DefaultMutableTreeNode getTree(SapforTasksPackage package_in) {
        SapforTasksResults_json results_json = getLocalResults(package_in);
        //--  флаги                 группы
-        LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> sortedTasks = results_json.sortTasksFlagsAndGroups();
+        LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = results_json.sortTasksByConfigurationsAndGroups();
        //--
        DefaultMutableTreeNode root = new DefaultMutableTreeNode(package_in.id);
-        for (String flags : sortedTasks.keySet()) {
-            DefaultMutableTreeNode flagsNode = new DefaultMutableTreeNode(flags);
-            //---
-            LinkedHashMap<String, Vector<SapforTask>> tasksByGroups = sortedTasks.get(flags);
-            for (String group : tasksByGroups.keySet()) {
+        for (String configuration_id:  tasksByConfigurations.keySet()){
+            System.out.println(configuration_id);
+            DefaultMutableTreeNode configurationNode = new DefaultMutableTreeNode(configuration_id);
+            LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
+            for (String group: groups_tasks.keySet()){
+                System.out.println(group);
                DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(group);
-                //--
-                Vector<SapforTask> tasks = tasksByGroups.get(group);
-                for (SapforTask task : tasks) {
+                for (SapforTask task: groups_tasks.get(group)){
+                    System.out.println(task.id);
                    DefaultMutableTreeNode taskNode = new DefaultMutableTreeNode(task.test_description);
-                    for (SapforVersion_json version: task.versions){
-                        DefaultMutableTreeNode versionNode = new DefaultMutableTreeNode(version.description);
-                        //
-                        Vector<DBProjectFile> files = getProjectFiles(version.version);
-                        taskNode.add(versionNode);
-                    }
-                    for (SapforVersion_json version: task.variants){
-                        DefaultMutableTreeNode versionNode = new DefaultMutableTreeNode(version.description);
-                        taskNode.add(versionNode);
-                    }
-                    //для каждой версии в узлы положить:
-                    //получить список исходных файлов.
-                    //получить список файлов для коррекции стиля кода.
                    groupNode.add(taskNode);
                }
-                flagsNode.add(groupNode);
+                configurationNode.add(groupNode);
            }
-            //---
-            root.add(flagsNode);
+            root.add(configurationNode);
        }
        return root;
    }
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
@@ -6,13 +6,15 @@ import javax.swing.tree.TreePath;
 public class SapforTasksPackageTree extends DataTree {
    public SapforTasksPackageTree(DefaultMutableTreeNode root_in) {
        super(root_in);
-        setRootVisible(false);
+     //   setRootVisible(false);
        CollapseAll();
    }
+    /*
    @Override
    protected int getStartLine() {
        return 1;
    }
+     */
    @Override
    public void SelectionAction(TreePath path) {}
    @Override