From 121d91cf779d625a0bb1c779c1848f496e57d029 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 4 Mar 2024 20:51:52 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 11 ++---
 src/Common/UI/UI.java                         |  2 +-
 .../UI}/SapforPackagesBar.java                |  3 +-
 .../Passes/All/CompareSapforPackages.java     | 46 +++++++++++++++++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  6 ++-
 .../UI/Interface/TestingWindow.java           |  2 +
 .../UI/Main/SapforPackagesComparisonForm.java | 14 ++++--
 src/Visual_DVM_2021/UI/Main/TestingForm.java  |  7 +++
 8 files changed, 78 insertions(+), 13 deletions(-)
 rename src/TestingSystem/SAPFOR/{SapforPackage => SapforTasksPackage/UI}/SapforPackagesBar.java (84%)
 create mode 100644 src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7ca5fa1b..46d873bb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,16 +7,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/EditGroupMenu.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ComparisonForm.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" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/Common/UI/UI.java b/src/Common/UI/UI.java
index 04f7a5d6..1473b909 100644
--- a/src/Common/UI/UI.java
+++ b/src/Common/UI/UI.java
@@ -60,7 +60,7 @@ import ProjectData.Files.UI.FilesTreeCellRenderer;
 import Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable;
 import TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
-import TestingSystem.SAPFOR.SapforPackage.SapforPackagesBar;
+import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackagesBar;
 import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
 import ProjectData.Project.UI.VersionsTreeCellRenderer;
 import ProjectData.SapforData.Arrays.ArraysSet;
diff --git a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
similarity index 84%
rename from src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java
rename to src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
index 21a60aae..6cdb6f97 100644
--- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
@@ -1,10 +1,11 @@
-package TestingSystem.SAPFOR.SapforPackage;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforPackagesBar extends DataMenuBar {
     public SapforPackagesBar() {
         super("пакеты задач SAPFOR",
                 PassCode_2021.SynchronizeTests,
+                PassCode_2021.CompareSapforPackages,
                 PassCode_2021.AddSapforPackage,
                 PassCode_2021.AddTasksToSapforPackage,
                 PassCode_2021.CloneSapforPackage,
diff --git a/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java b/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
new file mode 100644
index 00000000..d16e991f
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
@@ -0,0 +1,46 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Global;
+import Common.UI.UI;
+import Common.Utils.Utils;
+import TestingSystem.DVM.DVMTasks.DVMRunTask;
+import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
+import Visual_DVM_2021.Passes.Pass_2021;
+
+import java.util.Vector;
+public class CompareSapforPackages extends Pass_2021<Vector<SapforPackage>> {
+    SapforPackage master;
+    SapforPackage slave;
+    @Override
+    public String getIconPath() {
+        return "/icons/Comparsion.png";
+    }
+    @Override
+    public String getButtonText() {
+        return "";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        master = null;
+        slave = null;
+        //--
+        target = Global.testingServer.db.sapforPackages.getCheckedItems();
+        if (target.size() != 2) {
+            Log.Writeln_("Для сравнения требуется отметить два пакета.");
+            return false;
+        }
+        if (UI.Question("Назначить пакет " + Utils.Brackets(target.get(0).getPK()) + " эталоном" +
+                "\n(в случае отказа, будет назначен пакет " + Utils.Brackets(target.get(1).getPK()) + ")")) {
+            master = target.get(0);
+            slave = target.get(1);
+        } else {
+            master = target.get(1);
+            slave = target.get(0);
+        }
+        return true;
+    }
+    @Override
+    protected void body() throws Exception {
+        UI.getMainWindow().getTestingWindow().CompareSapforPackages(master, slave);
+    }
+}
+
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 9882aee3..babd0a9a 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -319,11 +319,15 @@ public enum PassCode_2021 {
     SPF_RemoveDeadCode,
     ReplaceTestProject,
     ReplaceTestsFromFiles,
-    CompareDVMRunTasks;
+    CompareDVMRunTasks,
+    CompareSapforPackages,
+    ;
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
+            case CompareSapforPackages:
+                return "Сравнить пакеты задач SAPFOR";
             case CompareDVMRunTasks:
                 return "Сравнить тестовые задачи на запуск";
             case ReplaceTestsFromFiles:
diff --git a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
index a55df2ff..92ce4f2b 100644
--- a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
+++ b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.UI.Interface;
 import TestingSystem.DVM.DVMTasks.DVMRunTask;
+import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 public interface TestingWindow extends VisualizerForm {
     void ShowAll();
     //-
@@ -23,4 +24,5 @@ public interface TestingWindow extends VisualizerForm {
     void ShowCurrentDVMPackage();
     void ShowNoCurrentDVMPackage();
     void CompareDVMRunTasks(DVMRunTask master, DVMRunTask slave);
+    void CompareSapforPackages(SapforPackage master, SapforPackage slave);
 }
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index c54d89eb..141dd062 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Current;
+import Common.Database.DBObject;
 import Common.UI.Label.ShortLabel;
 import Common.UI.Menus_2023.VisualiserMenuBar;
 import Common.UI.UI;
@@ -75,6 +76,13 @@ public class SapforPackagesComparisonForm {
         } else
             UI.Info(log.toString());
     }
+    public void ApplyObject(DBObject object_in) {
+        RemoveObject();
+        object = (SapforPackage) object_in;
+        if (object.isLoaded() || (Pass_2021.passes.get(PassCode_2021.DownloadSapforPackage).Do(object))) {
+            showObject();
+        }
+    }
     public void Show() throws Exception {
     }
     public void showNoObject() {
@@ -241,8 +249,8 @@ public class SapforPackagesComparisonForm {
                 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);
+                    for (SapforVersion_json version : task1.versions) {
+                        System.out.println(version + ":" + version.comparisonState);
                     }
                 }
                 //---
@@ -268,7 +276,7 @@ public class SapforPackagesComparisonForm {
             protected void showDone() throws Exception {
                 showComparisonTree();
                 slave.showComparisonTree();
-               // SynchronizeTrees();
+                // SynchronizeTrees();
             }
         };
         pass.Do();
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index 7739dba6..309f5ab8 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -6,6 +6,7 @@ import Common.UI.UI;
 import GlobalData.Compiler.CompilerType;
 import TestingSystem.Common.TestingServer;
 import TestingSystem.DVM.DVMTasks.DVMRunTask;
+import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import Visual_DVM_2021.UI.Interface.FormWithSplitters;
 import Visual_DVM_2021.UI.Interface.TestingWindow;
 
@@ -188,4 +189,10 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         dvmTestingRunSlave.ApplyObject(slave);
         testingTabs.setSelectedIndex(1);
     }
+    @Override
+    public void CompareSapforPackages(SapforPackage master, SapforPackage slave) {
+        sapforPackageTreeMaster.ApplyObject(master);
+        sapforPackageTreeSlave.ApplyObject(slave);
+        testingTabs.setSelectedIndex(3);
+    }
 }