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

промежуточный. убрал изменение порядка задач. вместо этого будет фильтр по состояниям

Browse Source
This commit is contained in:
02090095
2024-02-25 15:42:46 +03:00
parent a85446b72d
commit 0a2f2f05e1
5 changed files with 44 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
View File

@@ -116,12 +116,6 @@ public class SapforPackagesComparisonForm {
if (object.package_json == null) {
try {
object.readJson();
object.package_json.tasks.sort(Comparator.comparing(SapforTask::getUniqueKey));
for (SapforTask task : object.package_json.tasks)
object.package_json.allTasks.put(task.getUniqueKey(), task);
//---
object.package_json.SortTasks(); //по состояниям конфигурациям и группам
//---
object.package_json.buildTree(object);
//---
} catch (Exception ex) {
@@ -198,16 +192,18 @@ public class SapforPackagesComparisonForm {
package1 = object;
package2 = slave.object;
//--
if (package1.package_json.allTasks.size() != package2.package_json.allTasks.size()) {
if (package1.package_json.tasks.size() != package2.package_json.tasks.size()) {
Log.Writeln_("Количество задач в пакетах не совпадает!");
return false;
}
//--
for (String key1 : package1.package_json.allTasks.keySet()) {
/*
for (String key1 : package1.package_json.tasks) {
if (!package2.package_json.allTasks.containsKey(key1)) {
Log.Writeln_("Задача эталона " + key1 + "не найдена в сравниваемом пакете!");
}
}
*/
return Log.isEmpty();
}
return false;
@@ -233,6 +229,7 @@ public class SapforPackagesComparisonForm {
}
@Override
protected void body() throws Exception {
/*
System.out.println(package1.package_json.allTasks.size());
System.out.println(package2.package_json.allTasks.size());
@@ -254,6 +251,7 @@ public class SapforPackagesComparisonForm {
//-
package1.package_json.buildComparisonTree(package1);
package2.package_json.buildComparisonTree(package2);
*/
}
@Override
protected boolean validate() {