From 80616ffbd1b41f5c9702a0735818b2703e22b675 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 10 Nov 2023 02:56:35 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B8=D0=BD=D1=85=D1=80=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D1=81=D0=BA=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BB=D0=BB=D0=BE=D0=B2=20=D0=B4=D0=B5=D1=80=D0=B5=D0=B2=D1=8C?=
 =?UTF-8?q?=D0=B5=D0=B2=20=D0=BF=D1=80=D0=B8=20=D1=81=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                    |  3 ++-
 .../UI/Main/SapforPackagesComparisonForm.java          | 10 +++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index eba05d9f..ab5e1668 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.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/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/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index fb963412..22e99de8 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -35,6 +35,7 @@ public class SapforPackagesComparisonForm {
     //-->>
     //  protected DataSet<String, SapforTaskResult> packageTasks;
     protected DataSetControlForm Body;
+    public JScrollPane treeScroll = null;
     //--->>
     public boolean isMaster() {
         return slave != null;
@@ -82,7 +83,7 @@ public class SapforPackagesComparisonForm {
         treePanel.revalidate();
     }
     public void showComparisonTree() {
-        treePanel.add(new JScrollPane(
+        treePanel.add(treeScroll = new JScrollPane(
                 new SapforTasksPackageTree(object.results.comparison_root,
                         isMaster() ? Current.SapforEtalonVersion : Current.SapforVersion
                 )));
@@ -188,6 +189,10 @@ public class SapforPackagesComparisonForm {
             }
             @Override
             protected void performPreparation() throws Exception {
+                //--
+                treeScroll = null;
+                slave.treeScroll = null;
+                //--
                 package1.results.DropComparison();
                 package2.results.DropComparison();
             }
@@ -232,6 +237,7 @@ public class SapforPackagesComparisonForm {
             protected void showDone() throws Exception {
                 showComparisonTree();
                 slave.showComparisonTree();
+                slave.treeScroll.getVerticalScrollBar().setModel(treeScroll.getVerticalScrollBar().getModel());
             }
         };
         pass.Do();
@@ -262,4 +268,6 @@ public class SapforPackagesComparisonForm {
         pass.Do();
     }
     //предполагаем что оба объекта есть и мы можем получить с них текст.
+    //1. если режим сравнения. синхронизация выбора строк в деревьях.
+    //2. открытие выбранной версии как текущего проекта. (создание копии с распаковкой сообщений)
 }