From fa6f39bb213f749603deee832ee0d31f9f494ba5 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 14 Jul 2025 20:28:15 +0300
Subject: [PATCH] =?UTF-8?q?++=20=D0=91=D0=B0=D0=B3=20=D1=81=D0=BE=20=D1=81?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC.=20?=
 =?UTF-8?q?=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B2=D1=8B=D0=B5?=
 =?UTF-8?q?=20=D0=B4=D0=B2=D0=B0=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=20=D1=83?=
 =?UTF-8?q?=D1=81=D0=BF=D0=B5=D1=88=D0=BD=D0=BE=20=D1=81=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B2=D0=B0=D0=BB=D0=B8=D1=81=D1=8C,=20=D0=B2?=
 =?UTF-8?q?=D1=8B=D1=85=D0=BE=D0=B4=D0=B8=D0=BB=D0=BE=20=D0=B8=D0=B7=20?=
 =?UTF-8?q?=D1=86=D0=B8=D0=BA=D0=BB=D0=B0=20=D1=81=D1=80=D0=B0=D0=B2=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F.=20=D0=BF=D0=BE=D1=8D=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BC=D1=83=20=D0=BB=D0=BE=D0=B2=D0=B8=D0=BB=D0=B8=D1=81=D1=8C?=
 =?UTF-8?q?=20=D0=BD=D0=B5=20=D0=B2=D1=81=D0=B5=20=D1=80=D0=B0=D0=B7=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=87=D0=B8=D1=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  6 ++-
 src/_VisualDVM/Constants.java                 |  2 +-
 .../SAPFOR/Json/SapforVersion_json.java       |  5 ++-
 .../SAPFOR/SapforTask/SapforTask.java         | 42 +------------------
 .../SAPFOR/SapforTestingPlanner.java          |  2 +-
 .../Windows/SapforPackagesComparisonForm.java |  2 +-
 6 files changed, 12 insertions(+), 47 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 85157e29..e5e80792 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererTestingPackageStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererTestingPackageStatus.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index d89502e4..6882d043 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1256;
+    public static final int version = 1257;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java
index 1bfc20d1..b1bd1789 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java
@@ -122,7 +122,7 @@ public class SapforVersion_json implements Serializable {
             }
         }
     }
-    public boolean isMatchServer(SapforVersion_json version_json) {
+    public boolean isMatch(SapforVersion_json version_json) {
         if (!description.equals(version_json.description)) {
             return false;
         }
@@ -150,7 +150,8 @@ public class SapforVersion_json implements Serializable {
             } catch (Exception ex) {
                 ex.printStackTrace();
             }
-            return text1.equalsIgnoreCase(text2);
+            if (!text1.equalsIgnoreCase(text2))
+                return false;
         }
         return true;
     }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java
index 76c287a2..89b10377 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java
@@ -155,47 +155,7 @@ public class SapforTask extends DBObject {
                 SapforVersion_json version1 = versions1.get(name1);
                 SapforVersion_json version2 = versions2.get(name1);
                 //---
-                if (!version1.isMatchServer(version2)) {
-                    comparisonState = ComparisonState.NotMatch;
-                    task2.comparisonState = ComparisonState.NotMatch;
-                    version1.comparisonState = VersionComparisonState.NotMatch;
-                    version2.comparisonState = VersionComparisonState.NotMatch;
-                    //-
-                } else {
-                    version1.comparisonState = VersionComparisonState.Match;
-                    version2.comparisonState = VersionComparisonState.Match;
-                    //-
-                }
-            } else {
-                comparisonState = ComparisonState.NotMatch;
-                task2.comparisonState = ComparisonState.NotMatch;
-                //--
-            }
-        }
-        //--
-        if (comparisonState.equals(ComparisonState.Unknown)) {
-            comparisonState = ComparisonState.Match;
-            task2.comparisonState = ComparisonState.Match;
-        }
-    }
-    public void checkMatchServer(SapforTask task2) {
-        if (!state.equals(task2.state)) {
-            comparisonState = ComparisonState.NotMatch;
-            task2.comparisonState = ComparisonState.NotMatch;
-        }
-        if ((versions.size() != task2.versions.size()) || (variants.size() != task2.variants.size())) {
-            comparisonState = ComparisonState.NotMatch;
-            task2.comparisonState = ComparisonState.NotMatch;
-        }
-        LinkedHashMap<String, SapforVersion_json> versions1 = getSortedVersions();
-        LinkedHashMap<String, SapforVersion_json> versions2 = task2.getSortedVersions();
-        //---
-        for (String name1 : versions1.keySet()) {
-            if (versions2.containsKey(name1)) {
-                SapforVersion_json version1 = versions1.get(name1);
-                SapforVersion_json version2 = versions2.get(name1);
-                //---
-                if (!version1.isMatchServer(version2)) {
+                if (!version1.isMatch(version2)) {
                     comparisonState = ComparisonState.NotMatch;
                     task2.comparisonState = ComparisonState.NotMatch;
                     version1.comparisonState = VersionComparisonState.NotMatch;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
index 77b81d0c..280b4356 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -187,7 +187,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
                 //--
                 for (SapforTask task1 : ethalon.package_json.tasks) {
                     SapforTask task2 = testingPackage.package_json.getTaskByKey(task1.getUniqueKey());
-                    task1.checkMatchServer(task2); //тексты сравниваются просто посимвольно.
+                    task1.checkMatch(task2); //тексты сравниваются просто посимвольно.
                     if (task1.comparisonState.equals(ComparisonState.NotMatch)) {
                         testingPackage.mismatchesCount++;
                     }
diff --git a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
index 0fcc2096..41875c15 100644
--- a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
@@ -247,7 +247,7 @@ public class SapforPackagesComparisonForm {
                         package1.package_json.tasks.parallelStream()
                                 .forEach(task1 -> {
                                     SapforTask task2 = package2.package_json.getTaskByKey(task1.getUniqueKey());
-                                    task1.checkMatchServer(task2);
+                                    task1.checkMatch(task2);
                                 })
                 ).join();
                 System.out.println("done");