From 70ad507313ee3d75d2975a1a4e83d404c386e935 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 4 Mar 2024 22:27:49 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  8 ++---
 src/Repository/Component/Visualiser.java      |  2 +-
 .../Passes/All/CompareDVMRunTasks.java        | 31 +++++++++++-------
 .../Passes/All/CompareSapforPackages.java     | 32 ++++++++++++-------
 .../UI/Interface/TestingWindow.java           |  4 +++
 src/Visual_DVM_2021/UI/Main/TestingForm.java  | 12 +++++++
 6 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 46d873bb..dfcfca4a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,13 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <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/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/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.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/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/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index c5dac376..15969f0a 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 = 1072;
+        version = 1073;
         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/Passes/All/CompareDVMRunTasks.java b/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java
index eddc896a..b67b3421 100644
--- a/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java
+++ b/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java
@@ -23,22 +23,31 @@ public class CompareDVMRunTasks extends Pass_2021<Vector<DVMRunTask>> {
         slave = null;
         //--
         target = Global.testingServer.db.dvmRunTasks.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()) + ")")) {
+        if (target.size() == 2) {
+            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;
+        } else if (target.size() == 1) {
             master = target.get(0);
-            slave = target.get(1);
-        } else {
-            master = target.get(1);
-            slave = target.get(0);
+            slave = null;
+            return UI.Question("Отобразить задачу " + Utils.Brackets(target.get(0).getPK()));
+        } else if (target.size() != 2) {
+            Log.Writeln_("Для сравнения требуется отметить две задачи.\nДля отображения требуется отметить одну задачу");
+            return false;
         }
         return true;
     }
     @Override
     protected void body() throws Exception {
-        UI.getMainWindow().getTestingWindow().CompareDVMRunTasks(master, slave);
+        if (slave != null)
+            UI.getMainWindow().getTestingWindow().CompareDVMRunTasks(master, slave);
+        else
+            UI.getMainWindow().getTestingWindow().ShowDVMRunTask(master);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java b/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
index d16e991f..93c1b39e 100644
--- a/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
+++ b/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
@@ -2,7 +2,6 @@ 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;
 
@@ -24,23 +23,32 @@ public class CompareSapforPackages extends Pass_2021<Vector<SapforPackage>> {
         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()) + ")")) {
+        if (target.size() == 2) {
+            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;
+        } else if (target.size() == 1) {
             master = target.get(0);
-            slave = target.get(1);
-        } else {
-            master = target.get(1);
-            slave = target.get(0);
+            slave = null;
+            return UI.Question("Отобразить пакет " + Utils.Brackets(target.get(0).getPK()));
+        } else if (target.size() != 2) {
+            Log.Writeln_("Для сравнения требуется отметить два пакета.\nДля отображения требуется отметить один пакет");
+            return false;
         }
         return true;
     }
     @Override
     protected void body() throws Exception {
-        UI.getMainWindow().getTestingWindow().CompareSapforPackages(master, slave);
+        if (slave != null)
+            UI.getMainWindow().getTestingWindow().CompareSapforPackages(master, slave);
+        else
+            UI.getMainWindow().getTestingWindow().ShowSapforPackage(master);
     }
 }
 
diff --git a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
index 92ce4f2b..2d48b610 100644
--- a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
+++ b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
@@ -23,6 +23,10 @@ public interface TestingWindow extends VisualizerForm {
     void ShowNoServerSapfor();
     void ShowCurrentDVMPackage();
     void ShowNoCurrentDVMPackage();
+    //--
+    void ShowDVMRunTask(DVMRunTask master);
+    void ShowSapforPackage(SapforPackage master);
+    //-
     void CompareDVMRunTasks(DVMRunTask master, DVMRunTask slave);
     void CompareSapforPackages(SapforPackage master, SapforPackage slave);
 }
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index 309f5ab8..a80b112b 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -184,15 +184,27 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     public void ShowNoCurrentDVMPackage() {
     }
     @Override
+    public void ShowDVMRunTask(DVMRunTask master) {
+        dvmTestingRunMaster.ApplyObject(master);
+        testingTabs.setSelectedIndex(1);
+    }
+    @Override
+    public void ShowSapforPackage(SapforPackage master) {
+        sapforPackageTreeMaster.ApplyObject(master);
+        testingTabs.setSelectedIndex(3);
+    }
+    @Override
     public void CompareDVMRunTasks(DVMRunTask master, DVMRunTask slave) {
         dvmTestingRunMaster.ApplyObject(master);
         dvmTestingRunSlave.ApplyObject(slave);
+        dvmTestingRunMaster.DoComparePass(true);
         testingTabs.setSelectedIndex(1);
     }
     @Override
     public void CompareSapforPackages(SapforPackage master, SapforPackage slave) {
         sapforPackageTreeMaster.ApplyObject(master);
         sapforPackageTreeSlave.ApplyObject(slave);
+        sapforPackageTreeMaster.DoComparePass();
         testingTabs.setSelectedIndex(3);
     }
 }