no message

.idea/workspace.xml

@@ -7,16 +7,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/DebugWindow.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DebugForm.form" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DebugForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Group/Group.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Group/Group.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Compile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Compile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Test/Test.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Run.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Run.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/DebugWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/DebugWindow.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DebugForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DebugForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.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" />

src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java

@@ -45,12 +45,12 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
             @Override
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
-                UI.getMainWindow().getTestingWindow().DropRunTasksComparison();
+                UI.getDebugWindow().DropRunTasksComparison();
             }
             @Override
             public void ShowNoCurrentObject() throws Exception {
                 super.ShowNoCurrentObject();
-                UI.getMainWindow().getTestingWindow().DropRunTasksComparison();
+                UI.getDebugWindow().DropRunTasksComparison();
             }
             @Override
             public void CreateControl() {

src/GlobalData/Tasks/RunTask/RunTasksDBTable.java

@@ -36,12 +36,12 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
             @Override
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
-                UI.getMainWindow().getTestingWindow().ShowCurrentRunTask();
+                UI.getDebugWindow().ShowCurrentRunTask();
             }
             @Override
             public void ShowNoCurrentObject() throws Exception {
                 super.ShowNoCurrentObject();
-                UI.getMainWindow().getTestingWindow().ShowNoCurrentRunTask();
+                UI.getDebugWindow().ShowNoCurrentRunTask();
             }
             @Override
             public void CreateControl() {

src/Visual_DVM_2021/Passes/All/Compile.java

@@ -84,12 +84,6 @@ public class Compile extends Pass_2021<db_project_info> {
     @Override
     protected void showFinish() throws Exception {
         Global.db.compilationTasks.ShowUI(compilationTask.getPK());
-        UI.getMainWindow().getTestingWindow().ShowLastCompilationTask();
+        UI.getDebugWindow().ShowLastCompilationTask();
     }
-    /*
-    @Override
-    protected void showCanNotStart() throws Exception {
-        UI.getNewMainWindow().getTestingWindow().FocusCredentials();
-    }
-    */
 }

src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java

@@ -1,6 +1,5 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
-import Common.UI.UI;
 import Common.UI.Windows.Dialog.SessionMaxtimeDialog;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 public class EditProjectCompilationMaxtime extends CurrentProjectPass {
@@ -24,6 +23,5 @@ public class EditProjectCompilationMaxtime extends CurrentProjectPass {
     }
     @Override
     protected void showDone() throws Exception {
-        UI.getMainWindow().getTestingWindow().ShowProjectMaxCompilationTime();
     }
 }

src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java

@@ -1,6 +1,5 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
-import Common.UI.UI;
 import Common.UI.Windows.Dialog.SessionMaxtimeDialog;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 public class EditProjectRunMaxtime extends CurrentProjectPass {
@@ -24,6 +23,5 @@ public class EditProjectRunMaxtime extends CurrentProjectPass {
     }
     @Override
     protected void showDone() throws Exception {
-        UI.getMainWindow().getTestingWindow().ShowProjectMaxRunTime();
     }
 }

src/Visual_DVM_2021/Passes/All/Run.java

@@ -101,13 +101,13 @@ public class Run extends Pass_2021<db_project_info> {
             }
             //-
             Global.db.runTasks.RefreshUI();
-            UI.getMainWindow().getTestingWindow().ShowCurrentRunTask();
+            UI.getDebugWindow().ShowCurrentRunTask();
             //-
             if (!task_completed) break;
             ++i;
         }
         if (current_task!=null){
-            UI.getMainWindow().getTestingWindow().ShowLastRunTask();
+            UI.getDebugWindow().ShowLastRunTask();
         }
     }
 }

src/Visual_DVM_2021/UI/Interface/DebugWindow.java

@@ -3,4 +3,11 @@ import javax.swing.*;
 public interface DebugWindow {
     JPanel getContent();
     void ShowAll();
+    //--
+    void DropRunTasksComparison();
+    void DropCompilationTasksComparison();
+    void ShowLastCompilationTask();
+    void ShowCurrentRunTask();
+    void ShowLastRunTask();
+    void ShowNoCurrentRunTask();
 }

src/Visual_DVM_2021/UI/Interface/TestingWindow.java

@@ -1,28 +1,12 @@
 package Visual_DVM_2021.UI.Interface;
 public interface TestingWindow extends VisualizerForm {
     void ShowAll();
-    void ShowProjectMaxCompilationTime();
-    void ShowProjectMaxRunTime();
     //-
     void ShowCurrentTestsPackage();
     void DropTestRunTasksComparison();
-    void DropRunTasksComparison();
-    void DropCompilationTasksComparison();
     void ShowCurrentTestRunTask();
     void ShowNoTestRunTask();
     void DropSapforTasksComparison();
-
-    default void ShowSession() {
-        ShowProjectMaxCompilationTime();
-        ShowProjectMaxRunTime();
-    }
-    void ShowProject();
-    void ShowNoProject();
-    //-
-    void ShowCurrentCompilationTask();
-    void ShowNoCurrentCompilationTask();
-    void ShowCurrentRunTask();
-    void ShowNoCurrentRunTask();
     //-
     void RefreshTabsNames();
     void FocusTestingSystem();
@@ -31,17 +15,4 @@ public interface TestingWindow extends VisualizerForm {
     //-
     void FocusTestingTasks();
     boolean isEmailTestingOn();
-    void setUserRights();
-    void setAdminRights();
-    void setDeveloperRights();
-    void FocusScenarios();
-    //---------------------------------------->>>
-    void FocusSapforTasksPackages();
-    void ShowCurrentSapforTasksPackage();
-    void ShowNoSapforTasksPackage();
-    //----------------------------------------->>>
-    //--
-    void ShowLastCompilationTask();
-    void ShowLastRunTask();
-    //-
 }

src/Visual_DVM_2021/UI/Main/CallbackForm.java

@@ -396,17 +396,14 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
                 //видит только свои баги.
                 EnableBugreports();
                 setUserRights();
-                UI.getMainWindow().getTestingWindow().setUserRights();
                 break;
             case Developer:
                 EnableBugreports();
                 setDeveloperRights();
-                UI.getMainWindow().getTestingWindow().setDeveloperRights();
                 break;
             case Admin:
                 EnableBugreports();
                 setAdminRights();
-                UI.getMainWindow().getTestingWindow().setAdminRights();
                 break;
             default:
                 EnableBugreports();

src/Visual_DVM_2021/UI/Main/DebugForm.java

@@ -37,14 +37,54 @@ public class DebugForm implements DebugWindow, FormWithSplitters {
         return content;
     }
     @Override
+    public void SaveSplitters() {
+        FormWithSplitters.super.SaveSplitters();
+        try {
+            Global.db.SaveCredentials();
+        } catch (Exception ex) {
+            Global.Log.PrintException(ex);
+        }
+    }
+    @Override
+    public void DropRunTasksComparison() {
+        singleRunTaskMaster.RemoveObject();
+        singleRunTaskSlave.RemoveObject();
+    }
+    @Override
+    public void DropCompilationTasksComparison() {
+        singleCompilationTaskMaster.RemoveObject();
+        singleCompilationTaskSlave.RemoveObject();
+    }
+    @Override
+    public void ShowLastCompilationTask() {
+        singleCompilationTaskMaster.ApplyObject();
+    }
+    @Override
+    public void ShowLastRunTask() {
+        singleRunTaskMaster.ApplyObject();
+    }
+    @Override
+    public void ShowCurrentRunTask() {
+         //  if (singleRunTaskMaster.isActive()) singleRunTaskMaster.ShowTask();
+         //  else singleRunTaskSlave.ShowTask();
+    }
+    @Override
+    public void ShowNoCurrentRunTask() {
+         // if (singleRunTaskMaster.isActive()) singleRunTaskMaster.Clear();
+         // else singleRunTaskSlave.Clear();
+    }
+    //-
+    @Override
     public void ShowAll() {
-
+        Global.db.makefiles.ShowUI();
+        Global.db.runConfigurations.ShowUI();
+        Global.db.compilationTasks.ShowUI(); //их видимость зависит от текущего проекта.
+        Global.db.runTasks.ShowUI();
     }
     public DebugForm(){
         LoadSplitters();
         //--
         Global.db.makefiles.mountUI(makefilesPanel);
-        //-----------------------------------------------
         Global.db.modules.mountUI(modulesPanel);
         Global.db.runConfigurations.mountUI(runConfigurationsPanel);
         Global.db.environmentValues.mountUI(environmentsPanel);

src/Visual_DVM_2021/UI/Main/MainForm.java

@@ -59,8 +59,10 @@ public class MainForm extends Form implements MainWindow {
         SaveCredentialsPanel();
         SaveTestsPanel();
         SaveTestingPanel();
+        //--
         if (UI.debugWindow!=null)
             ((FormWithSplitters) UI.debugWindow).SaveSplitters();
+        //--
         Global.FinishApplication();
     }
     public MainForm() {
@@ -260,18 +262,16 @@ public class MainForm extends Form implements MainWindow {
     }
     @Override
     public void ShowProject() {
-        getTestingWindow().ShowProject();
         //-
         saveGlobalTab();
         RemoveProjectPanel();
         InstallProjectPanel();
         restoreGlobalTab();
-        getTestingWindow().DropCompilationTasksComparison();
+        UI.getDebugWindow().DropCompilationTasksComparison();
         UI.mainMenuBar.ShowProject(true);
     }
     @Override
     public void ShowNoProject() {
-        getTestingWindow().ShowNoProject();
         //-
         saveGlobalTab();
         RemoveProjectPanel();

src/Visual_DVM_2021/UI/Main/ProjectForm.java

@@ -78,19 +78,11 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
         filesForm.Show();
         InstallVersionsPanel();
         InstallDebugPanel();
+        UI.getDebugWindow().ShowAll();
         ShowAllAnalyses();
         ShowProjectView();
         SwitchScreen(Global.db.settings.get(SettingName.SmallScreen).toBoolean());
         RefreshTabsNames();
-        /*
-        SC3.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, new PropertyChangeListener() {
-            @Override
-            public void propertyChange(PropertyChangeEvent pce) {
-                // do here
-                UI.Info(pce.getNewValue().toString());
-            }
-        });
-         */
     }
     @Override
     public void SaveSplitters() {

src/Visual_DVM_2021/UI/Main/TestingForm.form

@@ -18,403 +18,6 @@
         <properties/>
         <border type="none"/>
         <children>
-          <grid id="b96d9" binding="projectDebugPanel" 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="Текущий проект" icon="icons/Common.png">
-                <tooltip value="Текущий проект"/>
-              </tabbedpane>
-            </constraints>
-            <properties/>
-            <border type="none"/>
-            <children>
-              <tabbedpane id="99328" binding="debugTabs">
-                <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/>
-                <border type="none"/>
-                <children>
-                  <grid id="a6120" layout-manager="BorderLayout" hgap="0" vgap="0">
-                    <constraints>
-                      <tabbedpane title="Компиляция">
-                        <tooltip value="Компиляция"/>
-                      </tabbedpane>
-                    </constraints>
-                    <properties/>
-                    <border type="none"/>
-                    <children>
-                      <splitpane id="f14b8" binding="SC51">
-                        <constraints border-constraint="Center"/>
-                        <properties>
-                          <dividerLocation value="200"/>
-                          <dividerSize value="3"/>
-                          <orientation value="0"/>
-                        </properties>
-                        <border type="none"/>
-                        <children>
-                          <grid id="40572" layout-manager="BorderLayout" hgap="0" vgap="0">
-                            <constraints>
-                              <splitpane position="right"/>
-                            </constraints>
-                            <properties/>
-                            <border type="none"/>
-                            <children>
-                              <splitpane id="138bf" binding="SC40">
-                                <constraints border-constraint="Center"/>
-                                <properties>
-                                  <dividerLocation value="197"/>
-                                  <dividerSize value="3"/>
-                                  <orientation value="0"/>
-                                </properties>
-                                <border type="none"/>
-                                <children>
-                                  <grid id="42d3f" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                    <constraints>
-                                      <splitpane position="left"/>
-                                    </constraints>
-                                    <properties/>
-                                    <border type="none"/>
-                                    <children>
-                                      <grid id="b9a7e" binding="compilationTasksPanel" 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="5e526" 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="df2e5" binding="SC41">
-                                        <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="500"/>
-                                          <dividerSize value="3"/>
-                                        </properties>
-                                        <border type="none"/>
-                                        <children>
-                                          <grid id="670e9" 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="200" height="200"/>
-                                            </properties>
-                                            <border type="none"/>
-                                            <children/>
-                                          </grid>
-                                          <grid id="ae368" 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>
-                                              <minimumSize width="200" height="200"/>
-                                            </properties>
-                                            <border type="none"/>
-                                            <children/>
-                                          </grid>
-                                        </children>
-                                      </splitpane>
-                                    </children>
-                                  </grid>
-                                </children>
-                              </splitpane>
-                            </children>
-                          </grid>
-                          <grid id="a0603" layout-manager="BorderLayout" hgap="0" vgap="0">
-                            <constraints>
-                              <splitpane position="left"/>
-                            </constraints>
-                            <properties>
-                              <minimumSize width="600" height="200"/>
-                            </properties>
-                            <border type="none"/>
-                            <children>
-                              <splitpane id="b6a2c" binding="SC20">
-                                <constraints border-constraint="Center"/>
-                                <properties>
-                                  <dividerLocation value="548"/>
-                                  <dividerSize value="3"/>
-                                </properties>
-                                <border type="none"/>
-                                <children>
-                                  <grid id="194c9" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                    <constraints>
-                                      <splitpane position="left"/>
-                                    </constraints>
-                                    <properties>
-                                      <maximumSize width="-1" height="-1"/>
-                                      <minimumSize width="300" height="-1"/>
-                                      <preferredSize width="-1" height="-1"/>
-                                    </properties>
-                                    <border type="none"/>
-                                    <children>
-                                      <grid id="a8eaf" binding="makefilesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                        <constraints border-constraint="Center"/>
-                                        <properties/>
-                                        <border type="none"/>
-                                        <children/>
-                                      </grid>
-                                    </children>
-                                  </grid>
-                                  <grid id="21871" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                    <constraints>
-                                      <splitpane position="right"/>
-                                    </constraints>
-                                    <properties>
-                                      <maximumSize width="-1" height="-1"/>
-                                      <minimumSize width="300" height="-1"/>
-                                      <preferredSize width="-1" height="-1"/>
-                                    </properties>
-                                    <border type="none"/>
-                                    <children>
-                                      <grid id="81257" binding="modulesPanel" 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="b2bea" layout-manager="BorderLayout" hgap="0" vgap="0">
-                    <constraints>
-                      <tabbedpane title="Запуск">
-                        <tooltip value="Запуск"/>
-                      </tabbedpane>
-                    </constraints>
-                    <properties/>
-                    <border type="none"/>
-                    <children>
-                      <splitpane id="2d25c" binding="SC52">
-                        <constraints border-constraint="Center"/>
-                        <properties>
-                          <dividerLocation value="150"/>
-                          <dividerSize value="3"/>
-                          <orientation value="0"/>
-                        </properties>
-                        <border type="none"/>
-                        <children>
-                          <grid id="47241" layout-manager="BorderLayout" hgap="0" vgap="0">
-                            <constraints>
-                              <splitpane position="right"/>
-                            </constraints>
-                            <properties/>
-                            <border type="none"/>
-                            <children>
-                              <splitpane id="77aeb" binding="SC42">
-                                <constraints border-constraint="Center"/>
-                                <properties>
-                                  <dividerLocation value="200"/>
-                                  <dividerSize value="3"/>
-                                  <orientation value="0"/>
-                                </properties>
-                                <border type="none"/>
-                                <children>
-                                  <grid id="dcf3e" 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>
-                                      <minimumSize width="0" height="200"/>
-                                    </properties>
-                                    <border type="none"/>
-                                    <children>
-                                      <splitpane id="21e91" binding="SC43">
-                                        <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="500"/>
-                                          <dividerSize value="3"/>
-                                        </properties>
-                                        <border type="none"/>
-                                        <children>
-                                          <grid id="5a1b6" 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="150" height="100"/>
-                                            </properties>
-                                            <border type="none"/>
-                                            <children/>
-                                          </grid>
-                                          <grid id="66252" 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>
-                                              <minimumSize width="150" height="100"/>
-                                            </properties>
-                                            <border type="none"/>
-                                            <children/>
-                                          </grid>
-                                        </children>
-                                      </splitpane>
-                                    </children>
-                                  </grid>
-                                  <grid id="b31c4" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                    <constraints>
-                                      <splitpane position="left"/>
-                                    </constraints>
-                                    <properties>
-                                      <minimumSize width="0" height="100"/>
-                                    </properties>
-                                    <border type="none"/>
-                                    <children>
-                                      <grid id="4741" binding="runTasksPanel" 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="c6f6f" layout-manager="BorderLayout" hgap="0" vgap="0">
-                            <constraints>
-                              <splitpane position="left"/>
-                            </constraints>
-                            <properties/>
-                            <border type="none"/>
-                            <children>
-                              <splitpane id="ca886" binding="SC21">
-                                <constraints border-constraint="Center"/>
-                                <properties>
-                                  <dividerLocation value="450"/>
-                                  <dividerSize value="3"/>
-                                </properties>
-                                <border type="none"/>
-                                <children>
-                                  <grid id="cf37b" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                    <constraints>
-                                      <splitpane position="left"/>
-                                    </constraints>
-                                    <properties>
-                                      <maximumSize width="-1" height="-1"/>
-                                      <minimumSize width="350" height="100"/>
-                                      <preferredSize width="-1" height="-1"/>
-                                    </properties>
-                                    <border type="none"/>
-                                    <children>
-                                      <grid id="b814c" binding="runConfigurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                        <constraints border-constraint="Center"/>
-                                        <properties>
-                                          <minimumSize width="0" height="0"/>
-                                        </properties>
-                                        <border type="none"/>
-                                        <children/>
-                                      </grid>
-                                    </children>
-                                  </grid>
-                                  <grid id="11dcc" 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>
-                                      <maximumSize width="-1" height="-1"/>
-                                      <minimumSize width="500" height="100"/>
-                                      <preferredSize width="-1" height="-1"/>
-                                    </properties>
-                                    <border type="none"/>
-                                    <children>
-                                      <splitpane id="b83b4" binding="SC35">
-                                        <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">
-                                            <minimum-size width="200" height="-1"/>
-                                            <preferred-size width="200" height="200"/>
-                                          </grid>
-                                        </constraints>
-                                        <properties>
-                                          <dividerLocation value="250"/>
-                                          <dividerSize value="3"/>
-                                        </properties>
-                                        <border type="none"/>
-                                        <children>
-                                          <grid id="3f228" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                            <constraints>
-                                              <splitpane position="left"/>
-                                            </constraints>
-                                            <properties>
-                                              <minimumSize width="250" height="100"/>
-                                            </properties>
-                                            <border type="none"/>
-                                            <children>
-                                              <grid id="553a0" binding="environmentsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                                <constraints border-constraint="Center"/>
-                                                <properties/>
-                                                <border type="none"/>
-                                                <children/>
-                                              </grid>
-                                            </children>
-                                          </grid>
-                                          <grid id="55d2b" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                            <constraints>
-                                              <splitpane position="right"/>
-                                            </constraints>
-                                            <properties>
-                                              <minimumSize width="250" height="100"/>
-                                            </properties>
-                                            <border type="none"/>
-                                            <children>
-                                              <grid id="e5966" binding="dvmParametersPanel" 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>
-                        </children>
-                      </splitpane>
-                    </children>
-                  </grid>
-                </children>
-              </tabbedpane>
-            </children>
-          </grid>
           <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"/>
             <constraints>

src/Visual_DVM_2021/UI/Main/TestingForm.java

@@ -15,16 +15,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     public JPanel getContent() {
         return content;
     }
-    public JSplitPane SC20;
-    public JSplitPane SC21;
-    public JSplitPane SC35;
-    public JSplitPane SC40;
-    public JSplitPane SC41;
-    public JSplitPane SC42;
-    public JSplitPane SC43;
     public JSplitPane SC50;
-    public JSplitPane SC51;
-    public JSplitPane SC52;
     public JSplitPane SC48;
     public JSplitPane SC49;
     public JSplitPane SC46;
@@ -36,42 +27,21 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     public JSplitPane SC59;
     //-
     //---
-    private JPanel machinesPanel;
-    private JPanel usersPanel;
-    private JPanel compilersPanel;
     private JTabbedPane testingTabs;
-    private JTabbedPane debugTabs;
-    private JPanel makefilesPanel;
-    private JPanel modulesPanel;
-    private JPanel runConfigurationsPanel;
-    private JToolBar environmentsTools;
-    private JPanel environmentsPanel;
-    private JToolBar parametersTools;
-    private JPanel dvmParametersPanel;
-    private JPanel groupsPanel;
-    private JPanel testsPanel;
     private JPanel testsRunTasksPanel;
     private JToolBar testsResultsTools;
     private JButton bChangeKernels;
     private JTextField filterName;
-    private JLabel testsMatchesLabel;
     private JPanel configurationsPanel;
-    private JLabel configurationsMatchesLabel;
-    private JLabel packagesMatchesLabel;
     private JPanel packagesPanel;
     private JButton bCompilationFilter;
     private JPanel dvmTestingPanel;
-    private JPanel projectDebugPanel;
-    private JPanel runTasksPanel;
-    private JPanel compilationTasksPanel;
     private JPanel sapforTestingPanel;
     private JPanel packageVersionsPanel;
     private JPanel sapforConfigurationsPanel;
     private JLabel sapforConfigurationsLabel;
     private JLabel sapforConfigurationsCommandsLabel;
     private JPanel sapforConfigurationCommandsPanel;
-    private JLabel sapforTasksPackagesLabel;
-    private JLabel sapforTasksLabel;
     private JPanel sapforScenariosPanel;
     private JPanel serverSapforsPanel;
     private JPanel sapforTasksPackagesPanel;
@@ -82,8 +52,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     private JToolBar compilationTasksTools;
     private JToolBar runTasksTools;
     //-
-    public RunTasksComparisonForm singleRunTaskMaster; // одиночные запуски
-    public RunTasksComparisonForm singleRunTaskSlave;
     //
     public CompilationTasksComparisonForm singleCompilationTaskMaster; // одиночная компиляция
     public CompilationTasksComparisonForm singleCompilationTaskSlave;
@@ -99,30 +67,12 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     public TestingForm() {
         LoadSplitters();
         //-
-        singleCompilationTaskMaster = new CompilationTasksComparisonForm(singleCompilationTaskSlave = new CompilationTasksComparisonForm(null));
-        singleRunTaskMaster = new RunTasksComparisonForm(singleRunTaskSlave = new RunTasksComparisonForm(null));
         dvmTestingRunMaster = new TestRunTasksComparisonForm(dvmTestingRunSlave = new TestRunTasksComparisonForm(null));
-        //-
-        Global.db.makefiles.mountUI(makefilesPanel);
-        //-----------------------------------------------
-        Global.db.modules.mountUI(modulesPanel);
-        Global.db.runConfigurations.mountUI(runConfigurationsPanel);
-        Global.db.environmentValues.mountUI(environmentsPanel);
-        Global.db.dvmParameters.mountUI(dvmParametersPanel);
-        //-
-        Global.db.compilationTasks.mountUI(compilationTasksPanel);
-        Global.db.runTasks.mountUI(runTasksPanel);
         //--->>>
         RefreshTabsNames();
         //-
-        SC41.setLeftComponent(singleCompilationTaskMaster.getContent());
-        SC41.setRightComponent(singleCompilationTaskSlave.getContent());
-        SC43.setLeftComponent(singleRunTaskMaster.getContent());
-        SC43.setRightComponent(singleRunTaskSlave.getContent());
-        //-
         SC50.setLeftComponent(dvmTestingRunMaster.getContent());
         SC50.setRightComponent(dvmTestingRunSlave.getContent());
-        ShowNoProject();
         //-
         Global.testingServer.db.configurations.mountUI(configurationsPanel);
         Global.testingServer.account_db.packages.mountUI(packagesPanel);
@@ -132,25 +82,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
         Global.testingServer.db.serverSapfors.mountUI(serverSapforsPanel);
         Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel);
-        // Global.testingServer.account_db.sapforTasks.mountUI(sapforTasksPanel);
         //--------------------------------------------------------------------->>>>
-        /*
-        filterName.getDocument().addDocumentListener(new DocumentListener() {
-            @Override
-            public void insertUpdate(DocumentEvent e) {
-                TestRunTaskInterface.filterName = filterName.getText();
-                Global.testingServer.account_db.testRunTasks.ShowUI();
-            }
-            @Override
-            public void removeUpdate(DocumentEvent e) {
-                TestRunTaskInterface.filterName = filterName.getText();
-                Global.testingServer.account_db.testRunTasks.ShowUI();
-            }
-            @Override
-            public void changedUpdate(DocumentEvent e) {
-            }
-        });
-         */
         sapforTestingMaster = new SapforPackagesComparisonForm(sapforTestingSlave = new SapforPackagesComparisonForm(null));
         SC57.setLeftComponent(sapforTestingMaster.getContent());
         SC57.setRightComponent(sapforTestingSlave.getContent());
@@ -159,22 +91,14 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     @Override
     public void ShowAll() {
         Global.testingServer.db.configurations.ShowUI();
+        Global.testingServer.account_db.packages.ShowUI();
+        //--
         Global.testingServer.db.serverSapfors.ShowUI();
         Global.testingServer.db.sapforConfigurations.ShowUI();
-        //----
-        Global.testingServer.account_db.packages.ShowUI();
         Global.testingServer.account_db.sapforTasksPackages.ShowUI();
     }
     //-
     @Override
-    public void ShowProjectMaxCompilationTime() {
-        //   mCompilationMaxtime.setText(Current.getProject().compilation_maxtime + " сек.");
-    }
-    @Override
-    public void ShowProjectMaxRunTime() {
-        //mRunMaxtime.setText(Current.getProject().run_maxtime + " сек.");
-    }
-    @Override
     public void ShowCurrentTestsPackage() {
         ShowCurrentTestRunTask();
     }
@@ -184,64 +108,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         dvmTestingRunSlave.RemoveObject();
     }
     @Override
-    public void DropRunTasksComparison() {
-        singleRunTaskMaster.RemoveObject();
-        singleRunTaskSlave.RemoveObject();
-    }
-    @Override
-    public void DropCompilationTasksComparison() {
-        singleCompilationTaskMaster.RemoveObject();
-        singleCompilationTaskSlave.RemoveObject();
-    }
-    @Override
-    public void ShowProject() {
-        testingTabs.setEnabledAt(0, true);
-        //-
-        ShowSession();
-        //-
-        Global.db.compilationTasks.ShowUI(); //их видимость зависит от текущего проекта.
-        Global.db.runTasks.ShowUI();
-    }
-    @Override
-    public void ShowNoProject() {
-        Global.db.compilationTasks.ClearUI();
-        Global.db.runTasks.ClearUI();
-        //-
-        if (testingTabs.getSelectedIndex() == 0)
-            testingTabs.setSelectedIndex(1);
-        testingTabs.setEnabledAt(0, false);
-    }
-    @Override
-    public void SaveSplitters() {
-        FormWithSplitters.super.SaveSplitters();
-        try {
-            Global.db.SaveCredentials();
-        } catch (Exception ex) {
-            Global.Log.PrintException(ex);
-        }
-    }
-    //-
-    @Override
-    public void ShowCurrentCompilationTask() {
-        // if (singleCompilationTaskMaster.isActive()) singleCompilationTaskMaster.ShowTask();
-        // else singleCompilationTaskSlave.ShowTask();
-    }
-    @Override
-    public void ShowNoCurrentCompilationTask() {
-        //  if (singleCompilationTaskMaster.isActive()) singleCompilationTaskMaster.Clear();
-        // else singleCompilationTaskSlave.Clear();
-    }
-    @Override
-    public void ShowCurrentRunTask() {
-        //   if (singleRunTaskMaster.isActive()) singleRunTaskMaster.ShowTask();
-        //   else singleRunTaskSlave.ShowTask();
-    }
-    @Override
-    public void ShowNoCurrentRunTask() {
-        //  if (singleRunTaskMaster.isActive()) singleRunTaskMaster.Clear();
-        //  else singleRunTaskSlave.Clear();
-    }
-    @Override
     public void ShowCurrentTestRunTask() {
         // if (dvmTestingRunMaster.isActive()) dvmTestingRunMaster.ShowTask();
         //  else dvmTestingRunSlave.ShowTask();
@@ -284,77 +150,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel);
         Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel);
     }
-    @Override
-    public void setUserRights() {
-        // testingTabs.removeTabAt(2);
-    }
-    @Override
-    public void setAdminRights() {
-        /*
-        testingTabs.insertTab("DVM система",
-                Utils.getIcon("/icons/DVM.png"),
-                dvmTestingPanel,
-                "DVM система", 2);
-
-         */
-    }
-    @Override
-    public void setDeveloperRights() {
-        /*
-        testingTabs.insertTab("DVM система",
-                Utils.getIcon("/icons/DVM.png"),
-                dvmTestingPanel,
-                "DVM система", 2);
-         */
-    }
-    @Override
-    public void FocusScenarios() {
-        testingTabs.setSelectedIndex(3);
-    }
-    @Override
-    public void FocusSapforTasksPackages() {
-    }
-    @Override
-    public void ShowCurrentSapforTasksPackage() {
-    }
-    @Override
-    public void ShowNoSapforTasksPackage() {
-        UI.Clear(packageVersionsPanel);
-    }
     //--->>>
-    /*
-    @Override
-    public void ShowCheckedTestsCount() {
-        int res = 0;
-        for (Group group : Global.testingServer.db.groups.getCheckedItems()) {
-            Vector<Test> selected_tests = new Vector<>();
-            Vector<Test> group_tests = new Vector<>();
-            for (Test test : Global.testingServer.db.tests.Data.values()) {
-                if (test.group_id.equals(group.id)) {
-                    if (test.isSelected())
-                        selected_tests.add(test);
-                    else
-                        group_tests.add(test);
-                }
-            }
-            //-
-            if (selected_tests.isEmpty())
-                res += group_tests.size();
-            else
-                res += selected_tests.size();
-        }
-        //--
-        testingTabs.setTitleAt(2, "Тесты: " + res);
-    }
-     */
-    @Override
-    public void ShowLastCompilationTask() {
-        singleCompilationTaskMaster.ApplyObject();
-    }
-    @Override
-    public void ShowLastRunTask() {
-        singleRunTaskMaster.ApplyObject();
-    }
     @Override
     public void DropSapforTasksComparison() {
         sapforTestingMaster.RemoveObject();