From f604f94858b748462b11a48c484b801feff4d7df Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 25 Dec 2023 18:18:59 +0300
Subject: [PATCH] v++

---
 .idea/workspace.xml                                        | 4 +---
 src/Common/Global.java                                     | 2 +-
 src/Repository/Component/Visualiser.java                   | 2 +-
 .../UI/Main/SapforPackagesComparisonForm.java              | 7 +++++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bf79b2d1..92cde530 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,9 +8,7 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Global.java b/src/Common/Global.java
index db818e6b..ad5a86b6 100644
--- a/src/Common/Global.java
+++ b/src/Common/Global.java
@@ -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());
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 85a171eb..91cbc614 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -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());
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index 02119ff0..030a579d 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -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() {