no message

This commit is contained in:
2024-02-16 21:44:13 +03:00
parent 1bb3da18c3
commit 0efd6ebb9b
19 changed files with 111 additions and 45 deletions

View File

@@ -131,7 +131,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
//основа
@Override
public int getPort() {
return 7998;
return Global.properties.TestingServerPort;
}
//---
@Override

View File

@@ -1,4 +1,5 @@
package TestingSystem.SAPFOR.Json;
import Common.UI.UI;
import GlobalData.Tasks.TaskState;
import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import TestingSystem.SAPFOR.SapforTask.MatchState;
@@ -40,6 +41,7 @@ public class SapforPackage_json implements Serializable {
//----
//---------
public void DropComparison() {
// UI.Info("DROP COMPARISON");
comparison_root = null;
comparisonSortedTasks.clear();
for (SapforTask task : allTasks.values())
@@ -89,6 +91,7 @@ public class SapforPackage_json implements Serializable {
comparisonSortedTasks.clear();
//раскидать задачи по состояниям, конфигам, группам
for (MatchState matchState : MatchState.values()) {
System.out.println("match_state="+matchState.toString());
LinkedHashMap<TaskState, LinkedHashMap<Integer, LinkedHashMap<String, Vector<SapforTask>>>> state_tasks = new LinkedHashMap<>();
comparisonSortedTasks.put(matchState, state_tasks);
//--
@@ -97,23 +100,25 @@ public class SapforPackage_json implements Serializable {
state_tasks.put(state, configuration_tasks);
//--
for (SapforTask task : tasks) {
if (task.match.equals(matchState) && task.state.equals(state)) {
LinkedHashMap<String, Vector<SapforTask>> groups_tasks = null;
if (configuration_tasks.containsKey(task.sapfor_configuration_id)) {
groups_tasks = configuration_tasks.get(task.sapfor_configuration_id);
} else {
groups_tasks = new LinkedHashMap<>();
configuration_tasks.put(task.sapfor_configuration_id, groups_tasks);
// if (matchState.equals(MatchState.Unknown)) {
if (task.match.equals(matchState) && task.state.equals(state)) {
LinkedHashMap<String, Vector<SapforTask>> groups_tasks = null;
if (configuration_tasks.containsKey(task.sapfor_configuration_id)) {
groups_tasks = configuration_tasks.get(task.sapfor_configuration_id);
} else {
groups_tasks = new LinkedHashMap<>();
configuration_tasks.put(task.sapfor_configuration_id, groups_tasks);
}
Vector<SapforTask> 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);
}
Vector<SapforTask> 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);
}
// }
}
}
//--

View File

@@ -54,7 +54,8 @@ public class SapforTask extends DBObject {
public Vector<SapforVersion_json> variants = new Vector<>();
//----------
@Description("IGNORE")
public MatchState match = MatchState.Unknown;
public MatchState match = MatchState.NotMatch;
// MatchState.Unknown;
//-----------
public String getUniqueKey() {
return sapfor_configuration_id + "_" + group_description + "_" + test_description;

View File

@@ -18,7 +18,7 @@ public class MatchesSummary extends SapforPackageTreeNode {
case NotMatch:
return "NotMatch";
default:
return "TestVersion";
return "Unknown";
}
}
}

View File

@@ -1,9 +1,12 @@
package TestingSystem.SAPFOR.SapforTasksPackage.UI;
import Common.UI.UI;
public class PackageSummary extends SapforPackageTreeNode {
public int count = 0;
@Override
public String getImageKey() {
return null;
// System.out.println("PACKAGE_SUMMARY "+ this.count);
return "UnknownStateSummary";
// return null;
}
public PackageSummary() {
}

View File

@@ -4,9 +4,11 @@ import javax.swing.tree.DefaultMutableTreeNode;
import java.util.Objects;
public abstract class SapforPackageTreeNode extends DefaultMutableTreeNode {
public ImageIcon getIcon() {
return (getImageKey() != null) ?
new ImageIcon(Objects.requireNonNull(getClass().getResource("/icons/versions/" + getImageKey() + ".png")))
: null;
// System.out.println(getImageKey());
ImageIcon res = new ImageIcon(Objects.requireNonNull(getClass().getResource("/icons/versions/" + getImageKey() + ".png")));
// System.out.println(res);
return (getImageKey() != null) ? res : null;
}
public abstract String getImageKey();
}