M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2023-11-09 01:47:46 +03:00
parent 3bcf8861f2
commit a6ebd5f1f9
6 changed files with 158 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
View File

@@ -17,6 +17,7 @@ import com.sun.org.glassfish.gmbal.Description;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;
import java.nio.file.Paths;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.Vector;
public class SapforTasksPackage extends nDBObject {
@@ -90,7 +91,13 @@ public class SapforTasksPackage extends nDBObject {
try {
results = (SapforTasksResults_json) Utils.jsonFromFile(json_file,
SapforTasksResults_json.class);
results.SortTasks();
//----
results.tasks.sort(Comparator.comparing(SapforTask::getUniqueKey));
for (SapforTask task : results.tasks)
results.allTasks.put(task.getUniqueKey(), task);
//---
results.SortTasks(); //по состояниям конфигурациям и группам
//---
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -102,14 +109,12 @@ public class SapforTasksPackage extends nDBObject {
}
//--
root = new PackageSummary();
LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> task_states =
results.sortTasksForTree();
//---
for (TaskState state : task_states.keySet()) {
for (TaskState state : results.sortedTasks.keySet()) {
//--
StateSummary stateSummary = new StateSummary(state);
//--
LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = task_states.get(state);
LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = results.sortedTasks.get(state);
for (String configuration_id : tasksByConfigurations.keySet()) {
//--
DefaultMutableTreeNode configurationNode = null;