From 2379f6580346f39f6595e5b6e132511d87171c82 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 22 Dec 2023 01:24:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8.=20v?=
 =?UTF-8?q?++?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                          |   2 +
 src/Repository/Component/Visualiser.java     |   2 +-
 src/Visual_DVM_2021/UI/Main/TestingForm.form | 522 ++++++++-----------
 src/Visual_DVM_2021/UI/Main/TestingForm.java |  13 +-
 4 files changed, 236 insertions(+), 303 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 679b82b6..d111f9d2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,6 +9,8 @@
     <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/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.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/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index bb07ab5f..297a2cb7 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1053;
+        version = 1054;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.form b/src/Visual_DVM_2021/UI/Main/TestingForm.form
index 06fcb638..5b34adba 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.form
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.form
@@ -15,63 +15,37 @@
         <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="66764" layout-manager="BorderLayout" hgap="0" vgap="0">
             <constraints>
-              <tabbedpane title="DVM система" icon="icons/DVM.png">
-                <tooltip value="DVM система"/>
-              </tabbedpane>
+              <tabbedpane title="DVM система" icon="icons/DVM.png"/>
             </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>
+              <tabbedpane id="7f50a" binding="dvmTabs">
+                <constraints border-constraint="Center"/>
+                <properties/>
                 <border type="none"/>
                 <children>
-                  <grid id="2ead5" layout-manager="BorderLayout" hgap="0" vgap="0">
+                  <grid id="fcf99" 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"/>
+                      <tabbedpane title="" icon="icons/Settings.png">
+                        <tooltip value="Настройки и пакеты задач"/>
+                      </tabbedpane>
                     </constraints>
                     <properties/>
                     <border type="none"/>
                     <children>
-                      <splitpane id="c6872" binding="SC49">
+                      <splitpane id="46704" binding="SC48">
                         <constraints border-constraint="Center"/>
                         <properties>
-                          <dividerLocation value="100"/>
+                          <dividerLocation value="150"/>
                           <dividerSize value="3"/>
                           <orientation value="0"/>
                         </properties>
                         <border type="none"/>
                         <children>
-                          <grid id="89d8b" layout-manager="BorderLayout" hgap="0" vgap="0">
+                          <grid id="3e979" layout-manager="BorderLayout" hgap="0" vgap="0">
                             <constraints>
                               <splitpane position="left"/>
                             </constraints>
@@ -80,7 +54,7 @@
                             </properties>
                             <border type="none"/>
                             <children>
-                              <grid id="b1fe2" binding="dvmPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                              <grid id="ff76f" binding="configurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                                 <constraints border-constraint="Center"/>
                                 <properties/>
                                 <border type="none"/>
@@ -88,64 +62,74 @@
                               </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"/>
+                          <grid id="ee322" layout-manager="BorderLayout" hgap="0" vgap="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>
+                              <grid id="3a098" binding="dvmPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                <constraints border-constraint="Center"/>
+                                <properties/>
+                                <border type="none"/>
+                                <children/>
+                              </grid>
+                            </children>
+                          </grid>
+                        </children>
+                      </splitpane>
+                    </children>
+                  </grid>
+                  <grid id="e8a2c" layout-manager="BorderLayout" hgap="0" vgap="0">
+                    <constraints>
+                      <tabbedpane title="" icon="icons/Testing.png"/>
+                    </constraints>
+                    <properties/>
+                    <border type="none"/>
+                    <children>
+                      <splitpane id="79e9b" binding="SC46">
+                        <constraints border-constraint="Center"/>
+                        <properties>
+                          <dividerLocation value="131"/>
+                          <dividerSize value="3"/>
+                          <orientation value="0"/>
+                        </properties>
+                        <border type="none"/>
+                        <children>
+                          <grid id="1bd8e" layout-manager="BorderLayout" hgap="0" vgap="0">
+                            <constraints>
+                              <splitpane position="left"/>
+                            </constraints>
+                            <properties/>
+                            <border type="none"/>
+                            <children>
+                              <grid id="56dec" binding="dvmRunTasksPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                <constraints border-constraint="Center"/>
                                 <properties>
-                                  <dividerLocation value="131"/>
-                                  <dividerSize value="3"/>
-                                  <orientation value="0"/>
+                                  <minimumSize width="0" height="150"/>
                                 </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>
+                                <children/>
+                              </grid>
+                            </children>
+                          </grid>
+                          <grid id="c89e7" 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="4905" binding="SC50">
+                                <constraints border-constraint="Center"/>
+                                <properties>
+                                  <dividerSize value="3"/>
+                                </properties>
+                                <border type="none"/>
+                                <children/>
                               </splitpane>
                             </children>
                           </grid>
@@ -154,258 +138,208 @@
                     </children>
                   </grid>
                 </children>
-              </splitpane>
+              </tabbedpane>
             </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"/>
+          <grid id="12b6a" layout-manager="BorderLayout" hgap="0" vgap="0">
             <constraints>
-              <tabbedpane title="SAPFOR" icon="icons/Arrays/SpfPrivate.png">
-                <tooltip value="SAPFOR"/>
-              </tabbedpane>
+              <tabbedpane title="Система SAPFOR" icon="icons/Arrays/SpfPrivate.png"/>
             </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>
+              <tabbedpane id="18230" binding="sapforTabs">
+                <constraints border-constraint="Center"/>
                 <properties/>
                 <border type="none"/>
                 <children>
-                  <splitpane id="8543b" binding="SC53">
-                    <constraints border-constraint="Center"/>
-                    <properties>
-                      <dividerLocation value="100"/>
-                      <dividerSize value="3"/>
-                      <orientation value="0"/>
-                    </properties>
+                  <grid id="f1c94" layout-manager="BorderLayout" hgap="0" vgap="0">
+                    <constraints>
+                      <tabbedpane title="" icon="icons/Settings.png">
+                        <tooltip value="Настройки и пакеты задач"/>
+                      </tabbedpane>
+                    </constraints>
+                    <properties/>
                     <border type="none"/>
                     <children>
-                      <grid id="208f9" layout-manager="BorderLayout" hgap="0" vgap="0">
-                        <constraints>
-                          <splitpane position="right"/>
-                        </constraints>
-                        <properties/>
+                      <splitpane id="b085" binding="SC68">
+                        <constraints border-constraint="Center"/>
+                        <properties>
+                          <dividerLocation value="300"/>
+                          <dividerSize value="3"/>
+                          <orientation value="0"/>
+                        </properties>
                         <border type="none"/>
                         <children>
-                          <splitpane id="760d4" binding="SC56">
-                            <constraints border-constraint="Center"/>
+                          <grid id="3c37a" layout-manager="BorderLayout" hgap="0" vgap="0">
+                            <constraints>
+                              <splitpane position="left"/>
+                            </constraints>
+                            <properties/>
+                            <border type="none"/>
+                            <children>
+                              <splitpane id="10918" binding="SC63">
+                                <constraints border-constraint="Center"/>
+                                <properties>
+                                  <dividerLocation value="200"/>
+                                  <dividerSize value="3"/>
+                                </properties>
+                                <border type="none"/>
+                                <children>
+                                  <grid id="3ebb2" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                    <constraints>
+                                      <splitpane position="left"/>
+                                    </constraints>
+                                    <properties/>
+                                    <border type="none"/>
+                                    <children>
+                                      <grid id="10937" binding="serverSapforsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                        <constraints border-constraint="Center"/>
+                                        <properties/>
+                                        <border type="none"/>
+                                        <children/>
+                                      </grid>
+                                    </children>
+                                  </grid>
+                                  <grid id="59f66" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                    <constraints>
+                                      <splitpane position="right"/>
+                                    </constraints>
+                                    <properties/>
+                                    <border type="none"/>
+                                    <children>
+                                      <splitpane id="8ec35" binding="SC59">
+                                        <constraints border-constraint="Center"/>
+                                        <properties>
+                                          <dividerLocation value="450"/>
+                                          <dividerSize value="3"/>
+                                        </properties>
+                                        <border type="none"/>
+                                        <children>
+                                          <grid id="3065" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                            <constraints>
+                                              <splitpane position="left"/>
+                                            </constraints>
+                                            <properties>
+                                              <minimumSize width="300" height="100"/>
+                                            </properties>
+                                            <border type="none"/>
+                                            <children>
+                                              <grid id="a9b70" binding="sapforConfigurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                                <constraints border-constraint="Center"/>
+                                                <properties/>
+                                                <border type="none"/>
+                                                <children/>
+                                              </grid>
+                                            </children>
+                                          </grid>
+                                          <grid id="3edb3" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                            <constraints>
+                                              <splitpane position="right"/>
+                                            </constraints>
+                                            <properties>
+                                              <minimumSize width="300" height="0"/>
+                                            </properties>
+                                            <border type="none"/>
+                                            <children>
+                                              <grid id="f21f2" binding="sapforConfigurationCommandsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                                <constraints border-constraint="Center"/>
+                                                <properties/>
+                                                <border type="none"/>
+                                                <children/>
+                                              </grid>
+                                            </children>
+                                          </grid>
+                                        </children>
+                                      </splitpane>
+                                    </children>
+                                  </grid>
+                                </children>
+                              </splitpane>
+                            </children>
+                          </grid>
+                          <grid id="d9729" layout-manager="BorderLayout" hgap="0" vgap="0">
+                            <constraints>
+                              <splitpane position="right"/>
+                            </constraints>
+                            <properties/>
+                            <border type="none"/>
+                            <children>
+                              <grid id="f9d45" 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>
+                  <grid id="bec64" layout-manager="BorderLayout" hgap="0" vgap="0">
+                    <constraints>
+                      <tabbedpane title="" icon="icons/Comparsion.png"/>
+                    </constraints>
+                    <properties/>
+                    <border type="none"/>
+                    <children>
+                      <splitpane id="cdd2b" binding="SC64">
+                        <constraints border-constraint="Center"/>
+                        <properties>
+                          <dividerLocation value="400"/>
+                          <dividerSize value="3"/>
+                        </properties>
+                        <border type="none"/>
+                        <children>
+                          <splitpane id="32da5" binding="SC65">
+                            <constraints>
+                              <splitpane position="left"/>
+                            </constraints>
                             <properties>
-                              <dividerLocation value="100"/>
+                              <dividerLocation value="300"/>
                               <dividerSize value="3"/>
                               <orientation value="0"/>
                             </properties>
                             <border type="none"/>
                             <children>
-                              <grid id="e5393" layout-manager="BorderLayout" hgap="0" vgap="0">
+                              <grid id="eef68" layout-manager="BorderLayout" hgap="0" vgap="0">
                                 <constraints>
                                   <splitpane position="right"/>
                                 </constraints>
                                 <properties/>
                                 <border type="none"/>
-                                <children>
-                                  <tabbedpane id="30729" binding="sapforPackageTabs">
-                                    <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/>
-                                    <border type="none"/>
-                                    <children/>
-                                  </grid>
-                                </children>
+                                <children/>
                               </grid>
                             </children>
                           </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"/>
-                        <constraints>
-                          <splitpane position="left"/>
-                        </constraints>
-                        <properties/>
-                        <border type="none"/>
-                        <children>
-                          <splitpane id="fd5c0" binding="SC63">
+                          <splitpane id="1f9df" binding="SC66">
                             <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>
+                              <splitpane position="right"/>
                             </constraints>
                             <properties>
-                              <dividerLocation value="200"/>
+                              <dividerLocation value="300"/>
                               <dividerSize value="3"/>
+                              <orientation value="0"/>
                             </properties>
                             <border type="none"/>
                             <children>
-                              <grid id="71344" 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">
-                                    <constraints border-constraint="Center"/>
-                                    <properties/>
-                                    <border type="none"/>
-                                    <children/>
-                                  </grid>
-                                </children>
-                              </grid>
-                              <grid id="75d3f" layout-manager="BorderLayout" hgap="0" vgap="0">
+                              <grid id="cea21" layout-manager="BorderLayout" hgap="0" vgap="0">
                                 <constraints>
                                   <splitpane position="right"/>
                                 </constraints>
                                 <properties/>
                                 <border type="none"/>
-                                <children>
-                                  <splitpane id="3edb9" binding="SC59">
-                                    <constraints border-constraint="Center"/>
-                                    <properties>
-                                      <dividerLocation value="450"/>
-                                      <dividerSize value="3"/>
-                                    </properties>
-                                    <border type="none"/>
-                                    <children>
-                                      <grid id="c8c41" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                        <constraints>
-                                          <splitpane position="left"/>
-                                        </constraints>
-                                        <properties>
-                                          <minimumSize width="300" height="100"/>
-                                        </properties>
-                                        <border type="none"/>
-                                        <children>
-                                          <grid id="f3493" binding="sapforConfigurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                            <constraints border-constraint="Center"/>
-                                            <properties/>
-                                            <border type="none"/>
-                                            <children/>
-                                          </grid>
-                                        </children>
-                                      </grid>
-                                      <grid id="a6851" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                        <constraints>
-                                          <splitpane position="right"/>
-                                        </constraints>
-                                        <properties>
-                                          <minimumSize width="300" height="0"/>
-                                        </properties>
-                                        <border type="none"/>
-                                        <children>
-                                          <grid id="25242" binding="sapforConfigurationCommandsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                            <constraints border-constraint="Center"/>
-                                            <properties/>
-                                            <border type="none"/>
-                                            <children/>
-                                          </grid>
-                                        </children>
-                                      </grid>
-                                    </children>
-                                  </splitpane>
-                                </children>
+                                <children/>
                               </grid>
                             </children>
                           </splitpane>
                         </children>
-                      </grid>
+                      </splitpane>
                     </children>
-                  </splitpane>
+                  </grid>
                 </children>
-              </grid>
+              </tabbedpane>
             </children>
           </grid>
         </children>
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index 9c1238b6..16fd1284 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -17,16 +17,14 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         return content;
     }
     public JSplitPane SC50;
+    public JSplitPane SC65;
+    public JSplitPane SC66;
     public JSplitPane SC48;
-    public JSplitPane SC49;
     public JSplitPane SC46;
-    public JSplitPane SC53;
-    public JSplitPane SC56;
+    public JSplitPane SC68;
     public JSplitPane SC63;
     public JSplitPane SC59;
     public JSplitPane SC64;
-    public JSplitPane SC65;
-    public JSplitPane SC66;
     //-
     //---
     private JTabbedPane testingTabs;
@@ -37,8 +35,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 +43,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     private JPanel sapforScenariosPanel;
     private JPanel serverSapforsPanel;
     private JPanel sapforPackagesPanel;
-    private JTabbedPane sapforPackageTabs;
+    private JTabbedPane dvmTabs;
+    private JTabbedPane sapforTabs;
     private JPanel testsRunTasksBackground;
     private JCheckBox filterFinished;
     private JButton bTest;