From 735db1334e0f3017bdc591d0b1f4851dece11ac0 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 30 Oct 2023 17:05:26 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  5 ++--
 .../UI/Main/SapforTasksComparisonForm.java    | 24 -------------------
 src/Visual_DVM_2021/UI/Main/TestingForm.form  | 22 ++++++++++++-----
 src/Visual_DVM_2021/UI/Main/TestingForm.java  |  9 +++----
 4 files changed, 23 insertions(+), 37 deletions(-)
 delete mode 100644 src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f92e0fd2..1b1f877d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,9 +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/Json/SapforTasksResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksResults_json.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/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.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/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" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java
deleted file mode 100644
index 5c75245b..00000000
--- a/src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package Visual_DVM_2021.UI.Main;
-import Common.Current;
-import SapforTestingSystem.SapforTask.SapforTask;
-//упразднить.
-public class SapforTasksComparisonForm extends TasksComparisonForm<SapforTask> {
-    public SapforTasksComparisonForm(ComparisonForm<SapforTask> slave_in) {
-        super(SapforTask.class, slave_in);
-    }
-    @Override
-    protected Current getCurrentObjectName() {
-        return Current.SapforTask;
-    }
-    @Override
-    protected String getTextByTab() {
-
-        return "";
-    }
-    @Override
-    protected TasksComparisonState[] getForbiddenStates() {
-        return new TasksComparisonState[]{
-                TasksComparisonState.Sts
-        };
-    }
-}
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.form b/src/Visual_DVM_2021/UI/Main/TestingForm.form
index 6b114e4f..52e03632 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.form
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.form
@@ -232,18 +232,28 @@
                                       </grid>
                                       <grid id="27fda" layout-manager="BorderLayout" hgap="0" vgap="0">
                                         <constraints>
-                                          <tabbedpane title="" icon="icons/VersionsTree.png">
-                                            <tooltip value="Дерево версий"/>
+                                          <tabbedpane title="" icon="icons/Comparsion.png">
+                                            <tooltip value="Сравнение пакетов"/>
                                           </tabbedpane>
                                         </constraints>
                                         <properties/>
                                         <border type="none"/>
                                         <children>
-                                          <grid id="17ec9" binding="sapforPackageTreePanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                          <grid id="17ec9" layout-manager="BorderLayout" hgap="0" vgap="0">
                                             <constraints border-constraint="Center"/>
                                             <properties/>
                                             <border type="none"/>
-                                            <children/>
+                                            <children>
+                                              <splitpane id="c2b4" binding="SC64">
+                                                <constraints border-constraint="Center"/>
+                                                <properties>
+                                                  <dividerLocation value="350"/>
+                                                  <dividerSize value="3"/>
+                                                </properties>
+                                                <border type="none"/>
+                                                <children/>
+                                              </splitpane>
+                                            </children>
                                           </grid>
                                         </children>
                                       </grid>
@@ -257,8 +267,8 @@
                                   <splitpane position="left"/>
                                 </constraints>
                                 <properties>
-                                  <minimumSize width="24" height="200"/>
-                                  <preferredSize width="204" height="200"/>
+                                  <minimumSize width="24" height="100"/>
+                                  <preferredSize width="204" height="100"/>
                                 </properties>
                                 <border type="none"/>
                                 <children>
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index 98b16919..dc7a12a3 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -1,9 +1,7 @@
 package Visual_DVM_2021.UI.Main;
-import Common.Current;
 import Common.Global;
 import Common.UI.TextField.StyledTextField;
 import Common.UI.UI;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
 import Visual_DVM_2021.UI.Interface.FormWithSplitters;
 import Visual_DVM_2021.UI.Interface.TestingWindow;
 
@@ -23,6 +21,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     public JSplitPane SC56;
     public JSplitPane SC63;
     public JSplitPane SC59;
+    public JSplitPane SC64;
     //-
     //---
     private JTabbedPane testingTabs;
@@ -45,7 +44,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     private JPanel sapforTasksPackagesPanel;
     private JTabbedPane sapforPackageTabs;
     private JPanel sapforTasksPanel;
-    private JPanel sapforPackageTreePanel;
     private JPanel testsRunTasksBackground;
     private JCheckBox filterFinished;
     private JButton bTest;
@@ -145,6 +143,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     }
     @Override
     public void ShowCurrentSapforTasksPackage() {
+        /*
         UI.Clear(sapforPackageTreePanel);
         if (SapforTasksPackageInterface.isLoaded(Current.getSapforTasksPackage())){
             sapforPackageTreePanel.add(
@@ -153,9 +152,11 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
            // new JScrollPane(new SapforTasksPackageTree(SapforTasksPackageInterface.getTree(Current.getSapforTasksPackage())))
                     ;
         }
+         */
     }
     @Override
     public void ShowNoCurrentSapforTasksPackage() {
-        UI.Clear(sapforPackageTreePanel);
+
+       // UI.Clear(sapforPackageTreePanel);
     }
 }