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-26 00:36:35 +03:00
parent 848d95ee14
commit 75c196f611
16 changed files with 149 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ import Common.UI.Label.ShortLabel;
import Common.UI.Menus_2023.VisualiserMenuBar;
import Common.UI.UI;
import Common.Utils.TextLog;
import TestingSystem.SAPFOR.Json.SapforVersion_json;
import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import TestingSystem.SAPFOR.SapforTask.SapforTask;
import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTasksPackageTree;
@@ -115,14 +116,14 @@ public class SapforPackagesComparisonForm {
if (object.package_json == null) {
try {
object.readJson();
object.package_json.getVersionsFiles(object);
object.package_json.buildTree(object);
//---
} catch (Exception ex) {
ex.printStackTrace();
}
} else {
object.package_json.DropComparison();
}
object.package_json.DropComparison();
//--
showCommonTree();
}
@@ -235,8 +236,16 @@ public class SapforPackagesComparisonForm {
task1.checkMatch(task2);
//--
++i;
//---
}
//--
for (SapforTask task1 : package1.package_json.tasks) {
SapforTask task2 = package2.package_json.getTaskByKey(task1.getUniqueKey());
//---
for (SapforVersion_json version: task1.versions){
System.out.println(version+":"+version.comparisonState);
}
}
//---
package1.package_json.buildComparisonTree(package1);
package2.package_json.buildComparisonTree(package2);
}

2
src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
View File

@@ -112,7 +112,7 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
@Override
protected void showObject() {
lObjectName.setText(object.toString());
lObjectName.setToolTipText(object.toString());
lObjectName.setToolTipText(object.Home.getName() + " : " + Utils.Brackets(object.description));
cbFile.removeAllItems();
for (ProjectFile file : object.files.values())
cbFile.addItem(file);