From e20ee062c6409c4cecf06b24e3a9b40dade4f2be Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 1 Mar 2024 21:01:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D1=81=D0=BF=D1=80=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=BA=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |   6 +
 .../SAPFOR/PerformSapforTask.java             |   2 +-
 .../Passes/All/DownloadDVMPackages.java       |   2 +-
 src/Visual_DVM_2021/UI/Main/TestingForm.form  | 460 ++++++++----------
 src/Visual_DVM_2021/UI/Main/TestingForm.java  |  28 +-
 src/Visual_DVM_2021/UI/Main/buffer_.form      | 180 ++++++-
 src/Visual_DVM_2021/UI/Main/buffer_.java      |   7 +
 7 files changed, 399 insertions(+), 286 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f97c2f71..55a9c693 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,6 +8,12 @@
   <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/TestingSystem/SAPFOR/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.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" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/TestingSystem/SAPFOR/PerformSapforTask.java b/src/TestingSystem/SAPFOR/PerformSapforTask.java
index b4cef0e2..cced70f6 100644
--- a/src/TestingSystem/SAPFOR/PerformSapforTask.java
+++ b/src/TestingSystem/SAPFOR/PerformSapforTask.java
@@ -93,7 +93,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
                 "create_variants",
                 sapfor_drv,
                 parentTask,
-                " -t 13 -allVars -tinfo",
+                " -t 13 -allVars",// -tinfo",
                 target.flags,
                 Constants.out_file,
                 Constants.err_file
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java b/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java
index 1dece8a5..fd8e132c 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java
@@ -18,7 +18,7 @@ public class DownloadDVMPackages extends Pass_2021<Vector<Integer>> {
     Vector<Pair<Integer, Pair<byte[], byte[]>>> packed_packages;
     @Override
     public String getIconPath() {
-        return "/icons/DownloadBugReport.png";
+        return "/icons/Apply.png";
     }
     @Override
     public String getButtonText() {
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.form b/src/Visual_DVM_2021/UI/Main/TestingForm.form
index 06fcb638..b3380834 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.form
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.form
@@ -10,297 +10,85 @@
     </properties>
     <border type="none"/>
     <children>
-      <tabbedpane id="2a81a" binding="testingTabs">
+      <tabbedpane id="b7e30" binding="testingTabs">
         <constraints border-constraint="Center"/>
         <properties/>
         <border type="none"/>
         <children>
-          <grid id="e6dae" binding="dvmTestingPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-            <margin top="0" left="0" bottom="0" right="0"/>
+          <grid id="ad5f9" binding="dvmPackagesTab" layout-manager="BorderLayout" hgap="0" vgap="0">
             <constraints>
-              <tabbedpane title="DVM система" icon="icons/DVM.png">
-                <tooltip value="DVM система"/>
+              <tabbedpane title="Пакеты DVM" icon="icons/DVM.png">
+                <tooltip value=""/>
               </tabbedpane>
             </constraints>
             <properties/>
             <border type="none"/>
             <children>
-              <splitpane id="f4599" binding="SC48">
-                <constraints>
-                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
-                    <preferred-size width="200" height="200"/>
-                  </grid>
-                </constraints>
-                <properties>
-                  <dividerLocation value="150"/>
-                  <dividerSize value="3"/>
-                  <orientation value="0"/>
-                </properties>
-                <border type="none"/>
-                <children>
-                  <grid id="2ead5" layout-manager="BorderLayout" hgap="0" vgap="0">
-                    <constraints>
-                      <splitpane position="left"/>
-                    </constraints>
-                    <properties>
-                      <minimumSize width="0" height="150"/>
-                    </properties>
-                    <border type="none"/>
-                    <children>
-                      <grid id="8060d" binding="configurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-                        <constraints border-constraint="Center"/>
-                        <properties/>
-                        <border type="none"/>
-                        <children/>
-                      </grid>
-                    </children>
-                  </grid>
-                  <grid id="2ad88" layout-manager="BorderLayout" hgap="0" vgap="0">
-                    <constraints>
-                      <splitpane position="right"/>
-                    </constraints>
-                    <properties/>
-                    <border type="none"/>
-                    <children>
-                      <splitpane id="c6872" binding="SC49">
-                        <constraints border-constraint="Center"/>
-                        <properties>
-                          <dividerLocation value="100"/>
-                          <dividerSize value="3"/>
-                          <orientation value="0"/>
-                        </properties>
-                        <border type="none"/>
-                        <children>
-                          <grid id="89d8b" layout-manager="BorderLayout" hgap="0" vgap="0">
-                            <constraints>
-                              <splitpane position="left"/>
-                            </constraints>
-                            <properties>
-                              <minimumSize width="0" height="150"/>
-                            </properties>
-                            <border type="none"/>
-                            <children>
-                              <grid id="b1fe2" binding="dvmPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                <constraints border-constraint="Center"/>
-                                <properties/>
-                                <border type="none"/>
-                                <children/>
-                              </grid>
-                            </children>
-                          </grid>
-                          <grid id="a8520" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-                            <margin top="0" left="0" bottom="0" right="0"/>
-                            <constraints>
-                              <splitpane position="right"/>
-                            </constraints>
-                            <properties/>
-                            <border type="none"/>
-                            <children>
-                              <splitpane id="670fe" binding="SC46">
-                                <constraints>
-                                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
-                                    <preferred-size width="200" height="200"/>
-                                  </grid>
-                                </constraints>
-                                <properties>
-                                  <dividerLocation value="131"/>
-                                  <dividerSize value="3"/>
-                                  <orientation value="0"/>
-                                </properties>
-                                <border type="none"/>
-                                <children>
-                                  <grid id="148f3" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                    <constraints>
-                                      <splitpane position="left"/>
-                                    </constraints>
-                                    <properties/>
-                                    <border type="none"/>
-                                    <children>
-                                      <grid id="242a7" binding="dvmRunTasksPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                        <constraints border-constraint="Center"/>
-                                        <properties>
-                                          <minimumSize width="0" height="150"/>
-                                        </properties>
-                                        <border type="none"/>
-                                        <children/>
-                                      </grid>
-                                    </children>
-                                  </grid>
-                                  <grid id="77cf1" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                    <constraints>
-                                      <splitpane position="right"/>
-                                    </constraints>
-                                    <properties>
-                                      <minimumSize width="240" height="150"/>
-                                    </properties>
-                                    <border type="none"/>
-                                    <children>
-                                      <splitpane id="f24" binding="SC50">
-                                        <constraints border-constraint="Center"/>
-                                        <properties>
-                                          <dividerSize value="3"/>
-                                        </properties>
-                                        <border type="none"/>
-                                        <children/>
-                                      </splitpane>
-                                    </children>
-                                  </grid>
-                                </children>
-                              </splitpane>
-                            </children>
-                          </grid>
-                        </children>
-                      </splitpane>
-                    </children>
-                  </grid>
-                </children>
-              </splitpane>
-            </children>
-          </grid>
-          <grid id="530e" binding="sapforTestingPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-            <margin top="0" left="0" bottom="0" right="0"/>
-            <constraints>
-              <tabbedpane title="SAPFOR" icon="icons/Arrays/SpfPrivate.png">
-                <tooltip value="SAPFOR"/>
-              </tabbedpane>
-            </constraints>
-            <properties/>
-            <border type="none"/>
-            <children>
-              <grid id="b68b4" layout-manager="BorderLayout" hgap="0" vgap="0">
-                <constraints>
-                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-                </constraints>
+              <grid id="28d90" layout-manager="BorderLayout" hgap="0" vgap="0">
+                <constraints border-constraint="Center"/>
                 <properties/>
                 <border type="none"/>
                 <children>
-                  <splitpane id="8543b" binding="SC53">
+                  <splitpane id="5df89" binding="SC71">
                     <constraints border-constraint="Center"/>
                     <properties>
-                      <dividerLocation value="100"/>
+                      <dividerLocation value="150"/>
                       <dividerSize value="3"/>
                       <orientation value="0"/>
                     </properties>
                     <border type="none"/>
                     <children>
-                      <grid id="208f9" layout-manager="BorderLayout" hgap="0" vgap="0">
+                      <grid id="f073a" binding="configurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                        <constraints>
+                          <splitpane position="left"/>
+                        </constraints>
+                        <properties/>
+                        <border type="none"/>
+                        <children/>
+                      </grid>
+                      <grid id="34404" layout-manager="BorderLayout" hgap="0" vgap="0">
                         <constraints>
                           <splitpane position="right"/>
                         </constraints>
                         <properties/>
                         <border type="none"/>
                         <children>
-                          <splitpane id="760d4" binding="SC56">
+                          <splitpane id="aeb24" binding="SC72">
                             <constraints border-constraint="Center"/>
                             <properties>
-                              <dividerLocation value="100"/>
+                              <dividerLocation value="200"/>
                               <dividerSize value="3"/>
                               <orientation value="0"/>
                             </properties>
                             <border type="none"/>
                             <children>
-                              <grid id="e5393" layout-manager="BorderLayout" hgap="0" vgap="0">
+                              <grid id="6722c" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                <constraints>
+                                  <splitpane position="left"/>
+                                </constraints>
+                                <properties/>
+                                <border type="none"/>
+                                <children>
+                                  <grid id="49418" binding="dvmPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                    <constraints border-constraint="Center"/>
+                                    <properties/>
+                                    <border type="none"/>
+                                    <children/>
+                                  </grid>
+                                </children>
+                              </grid>
+                              <grid id="726a0" layout-manager="BorderLayout" hgap="0" vgap="0">
                                 <constraints>
                                   <splitpane position="right"/>
                                 </constraints>
                                 <properties/>
                                 <border type="none"/>
                                 <children>
-                                  <tabbedpane id="30729" binding="sapforPackageTabs">
+                                  <grid id="7fb08" binding="dvmRunTasksPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                                     <constraints border-constraint="Center"/>
-                                    <properties/>
-                                    <border type="none"/>
-                                    <children>
-                                      <grid id="27fda" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                        <constraints>
-                                          <tabbedpane title="" icon="icons/Comparsion.png">
-                                            <tooltip value="Сравнение пакетов"/>
-                                          </tabbedpane>
-                                        </constraints>
-                                        <properties/>
-                                        <border type="none"/>
-                                        <children>
-                                          <grid id="17ec9" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                            <constraints border-constraint="Center"/>
-                                            <properties/>
-                                            <border type="none"/>
-                                            <children>
-                                              <splitpane id="c2b4" binding="SC64">
-                                                <constraints border-constraint="Center"/>
-                                                <properties>
-                                                  <dividerLocation value="400"/>
-                                                  <dividerSize value="3"/>
-                                                </properties>
-                                                <border type="none"/>
-                                                <children>
-                                                  <splitpane id="8e1d0" binding="SC65">
-                                                    <constraints>
-                                                      <splitpane position="left"/>
-                                                    </constraints>
-                                                    <properties>
-                                                      <dividerLocation value="300"/>
-                                                      <dividerSize value="3"/>
-                                                      <orientation value="0"/>
-                                                    </properties>
-                                                    <border type="none"/>
-                                                    <children>
-                                                      <grid id="10a70" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                                        <constraints>
-                                                          <splitpane position="right"/>
-                                                        </constraints>
-                                                        <properties/>
-                                                        <border type="none"/>
-                                                        <children/>
-                                                      </grid>
-                                                    </children>
-                                                  </splitpane>
-                                                  <splitpane id="e0ceb" binding="SC66">
-                                                    <constraints>
-                                                      <splitpane position="right"/>
-                                                    </constraints>
-                                                    <properties>
-                                                      <dividerLocation value="300"/>
-                                                      <dividerSize value="3"/>
-                                                      <orientation value="0"/>
-                                                    </properties>
-                                                    <border type="none"/>
-                                                    <children>
-                                                      <grid id="490c4" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                                        <constraints>
-                                                          <splitpane position="right"/>
-                                                        </constraints>
-                                                        <properties/>
-                                                        <border type="none"/>
-                                                        <children/>
-                                                      </grid>
-                                                    </children>
-                                                  </splitpane>
-                                                </children>
-                                              </splitpane>
-                                            </children>
-                                          </grid>
-                                        </children>
-                                      </grid>
-                                    </children>
-                                  </tabbedpane>
-                                </children>
-                              </grid>
-                              <grid id="7718" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-                                <margin top="0" left="0" bottom="0" right="0"/>
-                                <constraints>
-                                  <splitpane position="left"/>
-                                </constraints>
-                                <properties>
-                                  <minimumSize width="24" height="100"/>
-                                  <preferredSize width="204" height="100"/>
-                                </properties>
-                                <border type="none"/>
-                                <children>
-                                  <grid id="a8a6" binding="sapforPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                    <constraints>
-                                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-                                    </constraints>
-                                    <properties/>
+                                    <properties>
+                                      <minimumSize width="0" height="150"/>
+                                    </properties>
                                     <border type="none"/>
                                     <children/>
                                   </grid>
@@ -310,34 +98,85 @@
                           </splitpane>
                         </children>
                       </grid>
-                      <grid id="6e6e0" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-                        <margin top="0" left="0" bottom="0" right="0"/>
+                    </children>
+                  </splitpane>
+                </children>
+              </grid>
+            </children>
+          </grid>
+          <grid id="1f9bd" binding="dvmComparisonTab" layout-manager="BorderLayout" hgap="0" vgap="0">
+            <constraints>
+              <tabbedpane title="Сравнение" icon="icons/Comparsion.png">
+                <tooltip value="Сравнение пакетов тестирования DVM"/>
+              </tabbedpane>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <grid id="5ae89" layout-manager="BorderLayout" hgap="0" vgap="0">
+                <constraints border-constraint="Center"/>
+                <properties/>
+                <border type="none"/>
+                <children>
+                  <splitpane id="79feb" binding="SC50">
+                    <constraints border-constraint="Center"/>
+                    <properties>
+                      <dividerLocation value="500"/>
+                      <dividerSize value="3"/>
+                    </properties>
+                    <border type="none"/>
+                    <children/>
+                  </splitpane>
+                </children>
+              </grid>
+            </children>
+          </grid>
+          <grid id="abe81" binding="sapforPackagesTab" layout-manager="BorderLayout" hgap="0" vgap="0">
+            <constraints>
+              <tabbedpane title="Пакеты SAPFOR" icon="icons/Arrays/SpfPrivate.png">
+                <tooltip value=""/>
+              </tabbedpane>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <grid id="e46cf" layout-manager="BorderLayout" hgap="0" vgap="0">
+                <constraints border-constraint="Center"/>
+                <properties/>
+                <border type="none"/>
+                <children>
+                  <splitpane id="1d6a4" binding="SC70">
+                    <constraints border-constraint="Center"/>
+                    <properties>
+                      <dividerLocation value="200"/>
+                      <dividerSize value="3"/>
+                      <orientation value="0"/>
+                    </properties>
+                    <border type="none"/>
+                    <children>
+                      <grid id="fcfe3" layout-manager="BorderLayout" hgap="0" vgap="0">
                         <constraints>
                           <splitpane position="left"/>
                         </constraints>
                         <properties/>
                         <border type="none"/>
                         <children>
-                          <splitpane id="fd5c0" binding="SC63">
-                            <constraints>
-                              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
-                                <preferred-size width="200" height="200"/>
-                              </grid>
-                            </constraints>
+                          <splitpane id="631e" binding="SC63">
+                            <constraints border-constraint="Center"/>
                             <properties>
                               <dividerLocation value="200"/>
                               <dividerSize value="3"/>
                             </properties>
                             <border type="none"/>
                             <children>
-                              <grid id="71344" layout-manager="BorderLayout" hgap="0" vgap="0">
+                              <grid id="b5296" layout-manager="BorderLayout" hgap="0" vgap="0">
                                 <constraints>
                                   <splitpane position="left"/>
                                 </constraints>
                                 <properties/>
                                 <border type="none"/>
                                 <children>
-                                  <grid id="3f38c" binding="serverSapforsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                  <grid id="6fa99" binding="serverSapforsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                                     <constraints border-constraint="Center"/>
                                     <properties/>
                                     <border type="none"/>
@@ -345,22 +184,22 @@
                                   </grid>
                                 </children>
                               </grid>
-                              <grid id="75d3f" layout-manager="BorderLayout" hgap="0" vgap="0">
+                              <grid id="20b29" layout-manager="BorderLayout" hgap="0" vgap="0">
                                 <constraints>
                                   <splitpane position="right"/>
                                 </constraints>
                                 <properties/>
                                 <border type="none"/>
                                 <children>
-                                  <splitpane id="3edb9" binding="SC59">
+                                  <splitpane id="7df69" binding="SC59">
                                     <constraints border-constraint="Center"/>
                                     <properties>
-                                      <dividerLocation value="450"/>
+                                      <dividerLocation value="328"/>
                                       <dividerSize value="3"/>
                                     </properties>
                                     <border type="none"/>
                                     <children>
-                                      <grid id="c8c41" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                      <grid id="53e04" layout-manager="BorderLayout" hgap="0" vgap="0">
                                         <constraints>
                                           <splitpane position="left"/>
                                         </constraints>
@@ -369,7 +208,7 @@
                                         </properties>
                                         <border type="none"/>
                                         <children>
-                                          <grid id="f3493" binding="sapforConfigurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                          <grid id="fbd57" binding="sapforConfigurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                                             <constraints border-constraint="Center"/>
                                             <properties/>
                                             <border type="none"/>
@@ -377,7 +216,7 @@
                                           </grid>
                                         </children>
                                       </grid>
-                                      <grid id="a6851" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                      <grid id="71fcb" layout-manager="BorderLayout" hgap="0" vgap="0">
                                         <constraints>
                                           <splitpane position="right"/>
                                         </constraints>
@@ -386,7 +225,7 @@
                                         </properties>
                                         <border type="none"/>
                                         <children>
-                                          <grid id="25242" binding="sapforConfigurationCommandsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                          <grid id="a3fa0" binding="sapforConfigurationCommandsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                                             <constraints border-constraint="Center"/>
                                             <properties/>
                                             <border type="none"/>
@@ -402,6 +241,91 @@
                           </splitpane>
                         </children>
                       </grid>
+                      <grid id="d07cf" layout-manager="BorderLayout" hgap="0" vgap="0">
+                        <constraints>
+                          <splitpane position="right"/>
+                        </constraints>
+                        <properties/>
+                        <border type="none"/>
+                        <children>
+                          <grid id="63cbc" binding="sapforPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                            <constraints border-constraint="Center"/>
+                            <properties/>
+                            <border type="none"/>
+                            <children/>
+                          </grid>
+                        </children>
+                      </grid>
+                    </children>
+                  </splitpane>
+                </children>
+              </grid>
+            </children>
+          </grid>
+          <grid id="4f7f1" binding="sapforComparisonTab" layout-manager="BorderLayout" hgap="0" vgap="0">
+            <constraints>
+              <tabbedpane title="Сравнение" icon="icons/Comparsion.png">
+                <tooltip value="Сравнение пакетов тестирования SAPFOR"/>
+              </tabbedpane>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <grid id="d9664" layout-manager="BorderLayout" hgap="0" vgap="0">
+                <constraints border-constraint="Center"/>
+                <properties/>
+                <border type="none"/>
+                <children>
+                  <splitpane id="64e00" binding="SC64">
+                    <constraints border-constraint="Center"/>
+                    <properties>
+                      <dividerLocation value="500"/>
+                      <dividerSize value="3"/>
+                    </properties>
+                    <border type="none"/>
+                    <children>
+                      <splitpane id="c569d" binding="SC65">
+                        <constraints>
+                          <splitpane position="left"/>
+                        </constraints>
+                        <properties>
+                          <dividerLocation value="300"/>
+                          <dividerSize value="3"/>
+                          <orientation value="0"/>
+                        </properties>
+                        <border type="none"/>
+                        <children>
+                          <grid id="2c769" layout-manager="BorderLayout" hgap="0" vgap="0">
+                            <constraints>
+                              <splitpane position="right"/>
+                            </constraints>
+                            <properties/>
+                            <border type="none"/>
+                            <children/>
+                          </grid>
+                        </children>
+                      </splitpane>
+                      <splitpane id="5a374" binding="SC66">
+                        <constraints>
+                          <splitpane position="right"/>
+                        </constraints>
+                        <properties>
+                          <dividerLocation value="300"/>
+                          <dividerSize value="3"/>
+                          <orientation value="0"/>
+                        </properties>
+                        <border type="none"/>
+                        <children>
+                          <grid id="c0acb" layout-manager="BorderLayout" hgap="0" vgap="0">
+                            <constraints>
+                              <splitpane position="right"/>
+                            </constraints>
+                            <properties/>
+                            <border type="none"/>
+                            <children/>
+                          </grid>
+                        </children>
+                      </splitpane>
                     </children>
                   </splitpane>
                 </children>
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index 9c1238b6..1b9bbe93 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -17,19 +17,21 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         return content;
     }
     public JSplitPane SC50;
-    public JSplitPane SC48;
-    public JSplitPane SC49;
-    public JSplitPane SC46;
-    public JSplitPane SC53;
-    public JSplitPane SC56;
-    public JSplitPane SC63;
-    public JSplitPane SC59;
-    public JSplitPane SC64;
     public JSplitPane SC65;
     public JSplitPane SC66;
-    //-
+    public JSplitPane SC64;
+    public JSplitPane SC70;
+    public JSplitPane SC63;
+    public JSplitPane SC59;
+    public JSplitPane SC71;
+    public JSplitPane SC72;
     //---
     private JTabbedPane testingTabs;
+    private JPanel dvmPackagesTab;
+    private JPanel dvmComparisonTab;
+    private JPanel sapforPackagesTab;
+    private JPanel sapforComparisonTab;
+
     private JPanel dvmRunTasksPanel;
     private JToolBar testsResultsTools;
     private JButton bChangeKernels;
@@ -37,8 +39,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     private JPanel configurationsPanel;
     private JPanel dvmPackagesPanel;
     private JButton bCompilationFilter;
-    private JPanel dvmTestingPanel;
-    private JPanel sapforTestingPanel;
     private JPanel packageVersionsPanel;
     private JPanel sapforConfigurationsPanel;
     private JLabel sapforConfigurationsLabel;
@@ -47,7 +47,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     private JPanel sapforScenariosPanel;
     private JPanel serverSapforsPanel;
     private JPanel sapforPackagesPanel;
-    private JTabbedPane sapforPackageTabs;
+
     private JPanel testsRunTasksBackground;
     private JCheckBox filterFinished;
     private JButton bTest;
@@ -172,11 +172,11 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     }
     @Override
     public void ShowCurrentServerSapfor() {
-        testingTabs.setTitleAt(1,  "SAPFOR: " + Current.getServerSapfor().version);
+        testingTabs.setTitleAt(2,  "SAPFOR: " + Current.getServerSapfor().version);
     }
     @Override
     public void ShowNoServerSapfor() {
-        testingTabs.setTitleAt(1,  "SAPFOR: ?");
+        testingTabs.setTitleAt(2,  "SAPFOR: ?");
     }
     @Override
     public void ShowCurrentDVMPackage() {
diff --git a/src/Visual_DVM_2021/UI/Main/buffer_.form b/src/Visual_DVM_2021/UI/Main/buffer_.form
index f1b58b88..f8f8fc62 100644
--- a/src/Visual_DVM_2021/UI/Main/buffer_.form
+++ b/src/Visual_DVM_2021/UI/Main/buffer_.form
@@ -2,10 +2,186 @@
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Visual_DVM_2021.UI.Main.buffer_">
   <grid id="27dc6" layout-manager="BorderLayout" hgap="0" vgap="0">
     <constraints>
-      <xy x="20" y="20" width="0" height="400"/>
+      <xy x="20" y="20" width="932" height="766"/>
     </constraints>
     <properties/>
     <border type="none"/>
-    <children/>
+    <children>
+      <tabbedpane id="6396f" binding="testingTabs">
+        <constraints border-constraint="Center"/>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <grid id="8538d" binding="dvmTestingPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <tabbedpane title="DVM система" icon="icons/DVM.png">
+                <tooltip value="DVM система"/>
+              </tabbedpane>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <splitpane id="15235" binding="SC48">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+                    <preferred-size width="200" height="200"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <dividerLocation value="150"/>
+                  <dividerSize value="3"/>
+                  <orientation value="0"/>
+                </properties>
+                <border type="none"/>
+                <children>
+                  <grid id="3bbb" layout-manager="BorderLayout" hgap="0" vgap="0">
+                    <constraints>
+                      <splitpane position="left"/>
+                    </constraints>
+                    <properties>
+                      <minimumSize width="0" height="150"/>
+                    </properties>
+                    <border type="none"/>
+                    <children/>
+                  </grid>
+                  <grid id="d5ab3" layout-manager="BorderLayout" hgap="0" vgap="0">
+                    <constraints>
+                      <splitpane position="right"/>
+                    </constraints>
+                    <properties/>
+                    <border type="none"/>
+                    <children>
+                      <splitpane id="c0a85" binding="SC49">
+                        <constraints border-constraint="Center"/>
+                        <properties>
+                          <dividerLocation value="100"/>
+                          <dividerSize value="3"/>
+                          <orientation value="0"/>
+                        </properties>
+                        <border type="none"/>
+                        <children>
+                          <grid id="6b243" layout-manager="BorderLayout" hgap="0" vgap="0">
+                            <constraints>
+                              <splitpane position="left"/>
+                            </constraints>
+                            <properties>
+                              <minimumSize width="0" height="150"/>
+                            </properties>
+                            <border type="none"/>
+                            <children/>
+                          </grid>
+                          <grid id="d7c2c" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                            <margin top="0" left="0" bottom="0" right="0"/>
+                            <constraints>
+                              <splitpane position="right"/>
+                            </constraints>
+                            <properties/>
+                            <border type="none"/>
+                            <children>
+                              <splitpane id="646aa" binding="SC46">
+                                <constraints>
+                                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+                                    <preferred-size width="200" height="200"/>
+                                  </grid>
+                                </constraints>
+                                <properties>
+                                  <dividerLocation value="131"/>
+                                  <dividerSize value="3"/>
+                                  <orientation value="0"/>
+                                </properties>
+                                <border type="none"/>
+                                <children>
+                                  <grid id="17509" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                    <constraints>
+                                      <splitpane position="left"/>
+                                    </constraints>
+                                    <properties/>
+                                    <border type="none"/>
+                                    <children/>
+                                  </grid>
+                                  <grid id="44a83" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                    <constraints>
+                                      <splitpane position="right"/>
+                                    </constraints>
+                                    <properties>
+                                      <minimumSize width="240" height="150"/>
+                                    </properties>
+                                    <border type="none"/>
+                                    <children/>
+                                  </grid>
+                                </children>
+                              </splitpane>
+                            </children>
+                          </grid>
+                        </children>
+                      </splitpane>
+                    </children>
+                  </grid>
+                </children>
+              </splitpane>
+            </children>
+          </grid>
+          <grid id="51d53" binding="sapforTestingPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <tabbedpane title="SAPFOR" icon="icons/Arrays/SpfPrivate.png">
+                <tooltip value="SAPFOR"/>
+              </tabbedpane>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <grid id="33896" layout-manager="BorderLayout" hgap="0" vgap="0">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties/>
+                <border type="none"/>
+                <children>
+                  <tabbedpane id="d1545" binding="sapforTestingTabs">
+                    <constraints border-constraint="Center"/>
+                    <properties>
+                      <tabLayoutPolicy value="0"/>
+                      <tabPlacement value="1"/>
+                    </properties>
+                    <border type="none"/>
+                    <children>
+                      <grid id="95fea" layout-manager="BorderLayout" hgap="0" vgap="0">
+                        <constraints>
+                          <tabbedpane title="" icon="icons/Testing.png">
+                            <tooltip value="Пакеты"/>
+                          </tabbedpane>
+                        </constraints>
+                        <properties/>
+                        <border type="none"/>
+                        <children/>
+                      </grid>
+                      <grid id="a2493" layout-manager="BorderLayout" hgap="0" vgap="0">
+                        <constraints>
+                          <tabbedpane title="" icon="icons/Comparsion.png">
+                            <tooltip value="Сравнение пакетов"/>
+                          </tabbedpane>
+                        </constraints>
+                        <properties/>
+                        <border type="none"/>
+                        <children>
+                          <grid id="e24e6" layout-manager="BorderLayout" hgap="0" vgap="0">
+                            <constraints border-constraint="Center"/>
+                            <properties/>
+                            <border type="none"/>
+                            <children/>
+                          </grid>
+                        </children>
+                      </grid>
+                    </children>
+                  </tabbedpane>
+                </children>
+              </grid>
+            </children>
+          </grid>
+        </children>
+      </tabbedpane>
+    </children>
   </grid>
 </form>
diff --git a/src/Visual_DVM_2021/UI/Main/buffer_.java b/src/Visual_DVM_2021/UI/Main/buffer_.java
index 6653e06d..79ce5350 100644
--- a/src/Visual_DVM_2021/UI/Main/buffer_.java
+++ b/src/Visual_DVM_2021/UI/Main/buffer_.java
@@ -1,4 +1,11 @@
 package Visual_DVM_2021.UI.Main;
 import javax.swing.*;
 public class buffer_ {
+    private JTabbedPane testingTabs;
+    private JPanel dvmTestingPanel;
+    private JSplitPane SC48;
+    private JSplitPane SC49;
+    private JSplitPane SC46;
+    private JPanel sapforTestingPanel;
+    private JTabbedPane sapforTestingTabs;
 }