This commit is contained in:
2023-12-25 18:18:59 +03:00
parent 0370573269
commit f604f94858
4 changed files with 8 additions and 7 deletions

View File

@@ -119,7 +119,7 @@ public class Global {
Utils.CheckDirectory(PerformanceAnalyzerDirectory = Paths.get(Home, PerformanceAnalyzer).toFile());
Utils.CheckDirectory(DVMPackagesDirectory = Paths.get(Home, DVMPackages).toFile());
//через пару версий заменить на clean.
Utils.CheckAndCleanDirectory(SapforPackagesDirectory = Paths.get(Home, "SapforPackages").toFile());
Utils.CheckDirectory(SapforPackagesDirectory = Paths.get(Home, "SapforPackages").toFile());
}
public static void CheckServerDirectories() {
Utils.CheckDirectory(ComponentsDirectory = Paths.get(Home, components).toFile());

View File

@@ -62,7 +62,7 @@ public class Visualiser extends Component {
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override
public void GetVersionInfo() {
version = 1057;
version = 1058;
String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime());

View File

@@ -198,6 +198,11 @@ public class SapforPackagesComparisonForm {
package1 = object;
package2 = slave.object;
//--
if (package1.package_json.allTasks.size() != package2.package_json.allTasks.size()) {
Log.Writeln_("Количество задач в пакетах не совпадает!");
return false;
}
//--
for (String key1 : package1.package_json.allTasks.keySet()) {
if (!package2.package_json.allTasks.containsKey(key1)) {
Log.Writeln_("Задача эталона " + key1 + "не найдена в сравниваемом пакете!");
@@ -228,7 +233,6 @@ 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());
//теперь сравниваем задачи
@@ -248,7 +252,6 @@ public class SapforPackagesComparisonForm {
//-
package1.package_json.buildComparisonTree(package1);
package2.package_json.buildComparisonTree(package2);
}
@Override
protected boolean validate() {