From 73ab60913378ebe0f1b2b237d36cf2f84e5542cb Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 11 Nov 2023 20:07:14 +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=83=D0=B7=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=B4=D0=B5=D1=80=D0=B5=D0=B2=D1=8C=D0=B5=D0=B2=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2=20=D0=BF=D1=80=D0=B8?=
 =?UTF-8?q?=20=D1=81=D1=80=D0=B0=D0=B2=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                           |  2 +
 .../UI/SapforTasksPackageTree.java            | 39 ++++++++++++++++++-
 .../SapforTasksPackage/UI/VersionSummary.java |  1 +
 .../UI/Main/SapforPackagesComparisonForm.java | 11 ++++--
 4 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ab5e1668..e2eba712 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,6 +8,8 @@
   <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/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.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" />
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java b/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java
index de5c8b9b..237d955a 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java
@@ -7,8 +7,13 @@ import SapforTestingSystem.Json.SapforVersion_json;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
+import java.util.Vector;
 public class SapforTasksPackageTree extends DataTree {
     Current current;
+    SapforTasksPackageTree slave_tree = null;
+    public void setSlaveTree(SapforTasksPackageTree slave_tree_in) {
+        slave_tree = slave_tree_in;
+    }
     public SapforTasksPackageTree(DefaultMutableTreeNode root_in, Current current_in) {
         super(root_in);
         current = current_in;
@@ -20,7 +25,6 @@ public class SapforTasksPackageTree extends DataTree {
     @Override
     public void LeftMouseAction2() {
     }
-
     @Override
     public TreeRenderers getRenderer() {
         return TreeRenderers.RendererSapforVersion;
@@ -29,10 +33,42 @@ public class SapforTasksPackageTree extends DataTree {
     public Current getCurrent() {
         return current;
     }
+    public void selectSamePath_r(TreePath example, int index, DefaultMutableTreeNode node, Vector<DefaultMutableTreeNode> res) {
+        if (index < example.getPathCount()) {
+            DefaultMutableTreeNode exampleNode = (DefaultMutableTreeNode) example.getPathComponent(index);
+           // System.out.println("index = "+index);
+           // System.out.println("example node="+exampleNode.toString());
+           // System.out.println("node-"+node.toString());
+           // System.out.println("");
+            if (exampleNode.toString().equals(node.toString())) {
+                res.add(node);
+             //   System.out.println("+");
+                for (int i = 0; i < node.getChildCount(); ++i)
+                    selectSamePath_r(example, index+1, (DefaultMutableTreeNode) node.getChildAt(i), res);
+            }
+        }
+    }
+    public void selectSamePath(TreePath path_in) {
+        //  int i = path_in.getPath().length;
+        //  path_in.getPathComponent(i).toString();
+       // System.out.println("e = " + path_in);
+        Vector<DefaultMutableTreeNode> pathNodes = new Vector<>();
+        selectSamePath_r(path_in, 0, root, pathNodes);
+       // System.out.println("+");
+        TreePath path = new TreePath(pathNodes.toArray());
+      //  System.out.println(path);
+        setSelectionPath(path);
+     //   System.out.println("++");
+    }
     @Override
     public void SelectionAction(TreePath e) {
         DefaultMutableTreeNode node = (DefaultMutableTreeNode) e.getLastPathComponent();
         Object o = node.getUserObject();
+        //---
+        if (slave_tree != null) {
+            slave_tree.selectSamePath(e);
+        }
+        //---
         if (o instanceof SapforVersion_json) {
             SapforVersion_json version = (SapforVersion_json) o;
             Current.set(current, version);
@@ -40,6 +76,7 @@ public class SapforTasksPackageTree extends DataTree {
                 UI.getMainWindow().getTestingWindow().ShowCurrentSapforPackageVersionEtalon();
             else
                 UI.getMainWindow().getTestingWindow().ShowCurrentSapforPackageVersion();
+            //--
         }
     }
 }
\ No newline at end of file
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.java b/src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.java
index 5196b3ea..5ece8df9 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.java
@@ -1,6 +1,7 @@
 package SapforTestingSystem.SapforTasksPackage.UI;
 import SapforTestingSystem.Json.SapforVersion_json;
 public class VersionSummary extends SapforPackageTreeNode{
+
     public String version_name = "";
     public String version_description = "";
     public VersionSummary(SapforVersion_json version_json) {
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index 22e99de8..54a4f083 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -82,13 +82,15 @@ public class SapforPackagesComparisonForm {
         treePanel.repaint();
         treePanel.revalidate();
     }
-    public void showComparisonTree() {
+    public SapforTasksPackageTree showComparisonTree() {
+        SapforTasksPackageTree res = null;
         treePanel.add(treeScroll = new JScrollPane(
-                new SapforTasksPackageTree(object.results.comparison_root,
+                res =new SapforTasksPackageTree(object.results.comparison_root,
                         isMaster() ? Current.SapforEtalonVersion : Current.SapforVersion
                 )));
         treePanel.repaint();
         treePanel.revalidate();
+        return res;
     }
     //---
     public void showNoTree() {
@@ -201,6 +203,8 @@ public class SapforPackagesComparisonForm {
                 showNoTree();
                 slave.showNoTree();
                 //--->>>
+                UI.getMainWindow().getTestingWindow().ShowNoSapforPackageVersionEtalon();
+                UI.getMainWindow().getTestingWindow().ShowNoSapforPackageVersion();
             }
             @Override
             protected void body() throws Exception {
@@ -235,8 +239,7 @@ public class SapforPackagesComparisonForm {
             }
             @Override
             protected void showDone() throws Exception {
-                showComparisonTree();
-                slave.showComparisonTree();
+                showComparisonTree().setSlaveTree(slave.showComparisonTree());
                 slave.treeScroll.getVerticalScrollBar().setModel(treeScroll.getVerticalScrollBar().getModel());
             }
         };