diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c89b3f22..f92e0fd2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/src/SapforTestingSystem/Json/SapforTasksResults_json.java b/src/SapforTestingSystem/Json/SapforTasksResults_json.java
index 138e2659..aea1c055 100644
--- a/src/SapforTestingSystem/Json/SapforTasksResults_json.java
+++ b/src/SapforTestingSystem/Json/SapforTasksResults_json.java
@@ -13,47 +13,16 @@ public class SapforTasksResults_json {
public long EndDate = 0;
@Expose
public List tasks = new Vector<>();
- /*
- public LinkedHashMap>>> sortTasksByStatesFlagsAndGroups() {
- LinkedHashMap>>> res = new LinkedHashMap<>();
- //рассортировать задачи по конфигурациям.
- for (TaskState state : TaskState.values()) {
- LinkedHashMap>> tasksByFlags = new LinkedHashMap<>();
- res.put(state, tasksByFlags);
- //--
- for (SapforTask task : tasks) {
- if (task.state.equals(state)) {
- LinkedHashMap> groups_tasks = null;
- if (tasksByFlags.containsKey(task.flags)) {
- groups_tasks = tasksByFlags.get(task.flags);
- } else {
- groups_tasks = new LinkedHashMap<>();
- tasksByFlags.put(task.flags, groups_tasks);
- }
- Vector 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;
- }
- */
- public LinkedHashMap>> sortTasksFlagsAndGroups() {
- LinkedHashMap>> res = new LinkedHashMap<>();
- //рассортировать задачи по конфигурациям.
+ public LinkedHashMap>> sortTasksByConfigurationsAndGroups() {
+ LinkedHashMap>> tasksByConfigurations = new LinkedHashMap<>();
+ //--
for (SapforTask task : tasks) {
LinkedHashMap> groups_tasks = null;
- if (res.containsKey(task.flags)) {
- groups_tasks = res.get(task.flags);
+ if (tasksByConfigurations.containsKey(task.sapfor_configuration_id)) {
+ groups_tasks = tasksByConfigurations.get(task.sapfor_configuration_id);
} else {
groups_tasks = new LinkedHashMap<>();
- res.put(task.flags, groups_tasks);
+ tasksByConfigurations.put(task.sapfor_configuration_id, groups_tasks);
}
Vector tasks = null;
if (groups_tasks.containsKey(task.group_description)) {
@@ -64,7 +33,17 @@ public class SapforTasksResults_json {
}
tasks.add(task);
}
- return res;
+ for (String configuration_id: tasksByConfigurations.keySet()){
+ System.out.println(configuration_id);
+ LinkedHashMap> 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 tasksByConfigurations;
}
//--
public LinkedHashMap>>> sortTasksByStatesConfigurationsAndGroups() {
@@ -96,5 +75,4 @@ public class SapforTasksResults_json {
}
return res;
}
-
}
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
index a02ed671..5b34fd09 100644
--- 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>> sortedTasks = results_json.sortTasksFlagsAndGroups();
+ LinkedHashMap>> tasksByConfigurations = results_json.sortTasksByConfigurationsAndGroups();
//--
DefaultMutableTreeNode root = new DefaultMutableTreeNode(package_in.id);
- for (String flags : sortedTasks.keySet()) {
- DefaultMutableTreeNode flagsNode = new DefaultMutableTreeNode(flags);
- //---
- LinkedHashMap> 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> groups_tasks = tasksByConfigurations.get(configuration_id);
+ for (String group: groups_tasks.keySet()){
+ System.out.println(group);
DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(group);
- //--
- Vector 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 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;
}
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
index b30d6381..a4727b0d 100644
--- 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