From 9be7fa227f955b2cd66a1971fabad29484860159 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 28 Oct 2023 00:18:23 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                              |  7 +++----
 .../SapforTasksPackagesBar.java                  |  4 ++--
 .../SapforTasksPackageInterface.java             |  2 ++
 .../UI/Main/SapforPackageFields.java             | 16 ++++++++++++++--
 src/Visual_DVM_2021/UI/Main/TestingForm.java     |  7 ++++---
 5 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 454b5b8a..97ce1d84 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,10 +8,9 @@
   <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/SapforTask/SapforTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.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/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.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/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java b/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
index eec41d51..7672a4ba 100644
--- a/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
+++ b/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
@@ -6,8 +6,8 @@ public class SapforTasksPackagesBar extends DataMenuBar {
         super("пакеты задач",
                 PassCode_2021.AbortSapforTaskPackage,
                 PassCode_2021.DeleteSapforTasksPackage,
-                PassCode_2021.DownloadSapforTasksPackage,
-                PassCode_2021.ShowSapforTaskPackage
+                PassCode_2021.DownloadSapforTasksPackage
+               // PassCode_2021.ShowSapforTaskPackage
                 );
     }
 }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
index eafbd1ba..4b9f0219 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
@@ -56,6 +56,8 @@ public class SapforTasksPackageInterface {
                     DefaultMutableTreeNode taskNode = new DefaultMutableTreeNode(task.test_description);
                     for (SapforVersion_json version: task.versions){
                         DefaultMutableTreeNode versionNode = new DefaultMutableTreeNode(version.description);
+                        File
+                        Vector<DBProjectFile> files = getProjectFiles(version.version);
                         taskNode.add(versionNode);
                     }
                     for (SapforVersion_json version: task.variants){
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
index fc8a1c30..5033b50c 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
@@ -1,9 +1,14 @@
 package Visual_DVM_2021.UI.Main;
 import Common.UI.Windows.Dialog.DialogFields;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageTree;
 import Visual_DVM_2021.UI.Interface.FormWithSplitters;
 
 import javax.swing.*;
 public class SapforPackageFields implements DialogFields, FormWithSplitters {
+    SapforTasksPackage object = null;
+
     private JPanel content;
     public JSplitPane SCY;
     private JToolBar tools;
@@ -18,7 +23,14 @@ public class SapforPackageFields implements DialogFields, FormWithSplitters {
         return content;
     }
     public JPanel getTreePanel(){return treePanel;}
-    public SapforPackageFields(){
-
+    public SapforPackageFields(){}
+    public SapforPackageFields(SapforTasksPackage object_in){
+        LoadSplitters();
+        object = object_in;
+        //--
+        lObjectName.setText(object.id);
+        treePanel.add(
+                new JScrollPane(
+                        new SapforTasksPackageTree(SapforTasksPackageInterface.getTree(object))));
     }
 }
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index b5aee4c8..98b16919 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -4,7 +4,6 @@ import Common.Global;
 import Common.UI.TextField.StyledTextField;
 import Common.UI.UI;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageTree;
 import Visual_DVM_2021.UI.Interface.FormWithSplitters;
 import Visual_DVM_2021.UI.Interface.TestingWindow;
 
@@ -149,8 +148,10 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         UI.Clear(sapforPackageTreePanel);
         if (SapforTasksPackageInterface.isLoaded(Current.getSapforTasksPackage())){
             sapforPackageTreePanel.add(
-            new JScrollPane(
-                    new SapforTasksPackageTree(SapforTasksPackageInterface.getTree(Current.getSapforTasksPackage()))));
+                    new JScrollPane(new SapforPackageFields(Current.getSapforTasksPackage()).getContent())
+            );
+           // new JScrollPane(new SapforTasksPackageTree(SapforTasksPackageInterface.getTree(Current.getSapforTasksPackage())))
+                    ;
         }
     }
     @Override