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-03 02:33:19 +03:00
parent 2f53737c56
commit 6f61c835b5
3 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.idea/workspace.xml generated
View File

@@ -7,15 +7,8 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/icons/versions/BadVersion.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Trees/TreeRenderers.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Trees/TreeRenderers.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/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Project/UI/PackageVersionsTree.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Project/UI/PackageVersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

2
src/GlobalData/Tasks/TaskState.java
View File

@@ -17,13 +17,13 @@ public enum TaskState implements StatusEnum {
//----------------------- //-----------------------
Finished, Finished,
//--- результирующие //--- результирующие
Done,
DoneWithErrors, DoneWithErrors,
AbortedByTimeout, AbortedByTimeout,
AbortedByUser, AbortedByUser,
Crushed, Crushed,
WrongTestFormat, WrongTestFormat,
InternalError, InternalError,
Done,
//--- сугубо кластерные. //--- сугубо кластерные.
Queued, Queued,
NoSuchTask, NoSuchTask,

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

@@ -2,6 +2,7 @@ package SapforTestingSystem.SapforTasksPackage;
import Common.Constants; import Common.Constants;
import Common.Global; import Common.Global;
import Common.Utils.Utils; import Common.Utils.Utils;
import GlobalData.Tasks.TaskState;
import SapforTestingSystem.Json.SapforTasksResults_json; import SapforTestingSystem.Json.SapforTasksResults_json;
import SapforTestingSystem.SapforTask.SapforTask; import SapforTestingSystem.SapforTask.SapforTask;
import SapforTestingSystem.SapforTasksPackage.UI.ConfigurationDescription; import SapforTestingSystem.SapforTasksPackage.UI.ConfigurationDescription;
@@ -18,26 +19,37 @@ public class SapforTasksPackageInterface {
public static DefaultMutableTreeNode getTreeRoot(SapforTasksPackage package_in) { public static DefaultMutableTreeNode getTreeRoot(SapforTasksPackage package_in) {
SapforTasksResults_json results_json = getLocalResults(package_in); SapforTasksResults_json results_json = getLocalResults(package_in);
//-- флаги группы //-- флаги группы
LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = results_json.sortTasksByConfigurationsAndGroups(); LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = results_json.sortTasksByStatesConfigurationsAndGroups();
//-- //--
DefaultMutableTreeNode root = new DefaultMutableTreeNode(package_in.id); DefaultMutableTreeNode root = new DefaultMutableTreeNode(package_in.id);
for (String configuration_id : tasksByConfigurations.keySet()) { for (TaskState state : sortedTasks.keySet()) {
int count = 0;
//-- //--
DefaultMutableTreeNode configurationNode = null; DefaultMutableTreeNode stateNode = new DefaultMutableTreeNode(state.getDescription());
//-- LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = sortedTasks.get(state);
LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id); for (String configuration_id : tasksByConfigurations.keySet()) {
for (String group : groups_tasks.keySet()) { //--
DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(group); DefaultMutableTreeNode configurationNode = null;
for (SapforTask task : groups_tasks.get(group)) { //--
//-- LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
if (configurationNode == null) for (String group : groups_tasks.keySet()) {
configurationNode = new DefaultMutableTreeNode(new ConfigurationDescription(configuration_id, task)); DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(group);
//-- for (SapforTask task : groups_tasks.get(group)) {
groupNode.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id))); count++;
//--
if (configurationNode == null)
configurationNode = new DefaultMutableTreeNode(new ConfigurationDescription(configuration_id, task));
//--
groupNode.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id)));
}
configurationNode.add(groupNode);
} }
configurationNode.add(groupNode); stateNode.add(configurationNode);
}
if (stateNode.getChildCount() > 0) {
stateNode.setUserObject(state.getDescription() + ": " + count);
root.add(stateNode);
} }
root.add(configurationNode);
} }
return root; return root;
} }