no message

This commit is contained in:
2023-11-05 23:21:53 +03:00
parent bcd40d5acf
commit 1f5038724b
6 changed files with 45 additions and 40 deletions

9
.idea/workspace.xml generated
View File

@@ -7,15 +7,12 @@
</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/DoneStateSummary.png" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/icons/versions/ErrorsStateSummary.png" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/icons/versions/Configuration.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/icons/versions/UnknownStateSummary.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/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.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/UI/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationDescription.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.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" />

View File

@@ -5,7 +5,7 @@ import Common.Utils.Utils;
import GlobalData.Tasks.TaskState; 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.ConfigurationSummary;
import SapforTestingSystem.SapforTasksPackage.UI.StateSummary; import SapforTestingSystem.SapforTasksPackage.UI.StateSummary;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
@@ -51,7 +51,8 @@ public class SapforTasksPackageInterface {
LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = sortedTasks.get(state); LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = sortedTasks.get(state);
for (String configuration_id : tasksByConfigurations.keySet()) { for (String configuration_id : tasksByConfigurations.keySet()) {
//-- //--
DefaultMutableTreeNode configurationNode = null; ConfigurationSummary configurationSummary = new ConfigurationSummary();
DefaultMutableTreeNode configurationNode = new DefaultMutableTreeNode(configurationSummary);
//-- //--
LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id); LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
for (String group : groups_tasks.keySet()) { for (String group : groups_tasks.keySet()) {
@@ -60,8 +61,8 @@ public class SapforTasksPackageInterface {
//-- //--
stateSummary.count++; stateSummary.count++;
//-- //--
if (configurationNode == null) if (configurationSummary.text.isEmpty())
configurationNode = new DefaultMutableTreeNode(new ConfigurationDescription(configuration_id, task)); configurationSummary.init(configuration_id, task);
//-- //--
groupNode.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id))); groupNode.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id)));
} }

View File

@@ -1,25 +0,0 @@
package SapforTestingSystem.SapforTasksPackage.UI;
import Common.Utils.Utils;
import SapforTestingSystem.SapforTask.SapforTask;
import Visual_DVM_2021.Passes.PassCode_2021;
import java.util.Arrays;
import java.util.Vector;
public class ConfigurationDescription {
public String id = "";
public String text = "";
public ConfigurationDescription(String configuration_id, SapforTask task) {
id = configuration_id;
text = task.flags;
Vector<String> codes = new Vector<>(Arrays.asList(task.codes.split(" ")));
Vector<String> descriptions = new Vector<>();
for (int i = 1; i < codes.size(); ++i) {
descriptions.add(Utils.Brackets(PassCode_2021.valueOf(codes.get(i)).getDescription()));
}
text += " " + String.join("", descriptions);
}
@Override
public String toString() {
return text;
}
}

View File

@@ -0,0 +1,31 @@
package SapforTestingSystem.SapforTasksPackage.UI;
import Common.Utils.Utils;
import SapforTestingSystem.SapforTask.SapforTask;
import Visual_DVM_2021.Passes.PassCode_2021;
import java.util.Arrays;
import java.util.Vector;
public class ConfigurationSummary extends TreeSummary {
public String configuration_id = "";
public String flags = "";
public Vector<String> codes_descriptions = new Vector<>();
public ConfigurationSummary() {
}
public void init(String configuration_id_in, SapforTask task) {
configuration_id = configuration_id_in;
flags = task.flags;
Vector<String> codes_s = new Vector<>(Arrays.asList(task.codes.split(" ")));
for (int i = 1; i < codes_s.size(); ++i) {
codes_descriptions.add(Utils.Brackets(PassCode_2021.valueOf(codes_s.get(i)).getDescription()));
}
refreshText();
}
@Override
public void refreshText() {
text = flags + " " + String.join("", codes_descriptions);
}
@Override
public String getImageKey() {
return "Configuration";
}
}

View File

@@ -1,18 +1,19 @@
package SapforTestingSystem.SapforTasksPackage.UI; package SapforTestingSystem.SapforTasksPackage.UI;
import GlobalData.Tasks.TaskState; import GlobalData.Tasks.TaskState;
public class StateSummary extends TreeSummary{ public class StateSummary extends TreeSummary {
public TaskState state; public TaskState state;
public int count = 0; public int count = 0;
public StateSummary(TaskState state_in){ public StateSummary(TaskState state_in) {
state = state_in; state = state_in;
refreshText();
} }
@Override @Override
public void refreshText(){ public void refreshText() {
text = state.getDescription()+" : "+count; text = state.getDescription() + " : " + count;
} }
@Override @Override
public String getImageKey() { public String getImageKey() {
switch (state){ switch (state) {
case Done: case Done:
return "DoneStateSummary"; return "DoneStateSummary";
case DoneWithErrors: case DoneWithErrors:

Binary file not shown.

After

Width:  |  Height:  |  Size: 861 B