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
2024-02-25 17:37:49 +03:00
parent 0a2f2f05e1
commit 00af17e823
4 changed files with 58 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,6 @@ import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.*;
import java.util.Comparator;
public class SapforPackagesComparisonForm {
public boolean comparisonMode = false;
//-->>
@@ -121,6 +120,8 @@ public class SapforPackagesComparisonForm {
} catch (Exception ex) {
ex.printStackTrace();
}
}else {
object.package_json.DropComparison();
}
//--
showCommonTree();
@@ -197,13 +198,11 @@ public class SapforPackagesComparisonForm {
return false;
}
//--
/*
for (String key1 : package1.package_json.tasks) {
if (!package2.package_json.allTasks.containsKey(key1)) {
Log.Writeln_("Задача эталона " + key1 + "не найдена в сравниваемом пакете!");
}
//todo в дереве отображать пустые задачи заместо тех кого не хватает.
for (SapforTask task1 : package1.package_json.tasks) {
if (!package2.package_json.containsKey(task1.getUniqueKey()))
Log.Writeln_("Задача эталона " + task1.getUniqueKey() + "не найдена в сравниваемом пакете!");
}
*/
return Log.isEmpty();
}
return false;
@@ -229,29 +228,20 @@ 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());
System.out.println(package1.package_json.tasks.size());
System.out.println(package2.package_json.tasks.size());
//теперь сравниваем задачи
int i = 1;
for (String key1 : package1.package_json.allTasks.keySet()) {
System.out.println(i + "=" + key1);
SapforTask task1 = package1.package_json.allTasks.get(key1);
SapforTask task2 = package2.package_json.allTasks.get(key1);
//--
for (SapforTask task1 : package1.package_json.tasks) {
System.out.println(i + "=" + task1.getUniqueKey());
SapforTask task2 = package2.package_json.getTaskByKey(task1.getUniqueKey());
task1.checkMatch(task2);
//--
++i;
}
//--
package1.package_json.SortTasksForComparison();
package2.package_json.SortTasksForComparison();
//-
package1.package_json.buildComparisonTree(package1);
package2.package_json.buildComparisonTree(package2);
*/
}
@Override
protected boolean validate() {