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-10-29 03:07:30 +03:00
parent 46d5647294
commit a501f69910
4 changed files with 33 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
View File

@@ -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;
}

4
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
View File

@@ -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