no message

src/Visual_DVM_2021/UI/Main/MainForm.java

@@ -8,10 +8,7 @@ import Common.UI.Windows.FormType;
 import Common.Utils.Utils;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
-import Visual_DVM_2021.UI.Interface.CallbackWindow;
-import Visual_DVM_2021.UI.Interface.CredentialsWindow;
-import Visual_DVM_2021.UI.Interface.ProjectWindow;
-import Visual_DVM_2021.UI.Interface.TestingWindow;
+import Visual_DVM_2021.UI.Interface.*;
 
 import javax.swing.*;
 import java.awt.*;
@@ -22,21 +19,14 @@ public class MainForm extends Form implements MainWindow {
     private ProjectForm projectForm;
     private CallbackForm callbackForm;
     private CredentialsForm credentialsForm;
+    private TestsForm testsForm;
     //---
     private TestingForm testingForm;
     //-----------------
     private JPanel Content;
     private JTabbedPane globalTabs;
     private JPanel mainPanel;
-    public MainForm() {
-        mainPanel.add(UI.mainMenuBar, BorderLayout.NORTH);
-        InstallWelcomePanel();
-        InstallCredentialsPanel();
-        InstallCallbackPanel();
-        InstallTestingPanel();
-        ShowUpdatesIcon();
-        //----------------------
-    }
+
     @Override
     protected JPanel getMainPanel() {
         return Content;
@@ -64,9 +54,20 @@ public class MainForm extends Form implements MainWindow {
             ((VersionsForm) UI.getVersionsWindow()).SaveSplitters();
         SaveCallbackPanel();
         SaveCredentialsPanel();
+        SaveTestsPanel();
         SaveTestingPanel();
         Global.FinishApplication();
     }
+    public MainForm() {
+        mainPanel.add(UI.mainMenuBar, BorderLayout.NORTH);
+        InstallWelcomePanel();
+        InstallCallbackPanel();
+        InstallCredentialsPanel();
+        InstallTestsPanel();
+        InstallTestingPanel();
+        ShowUpdatesIcon();
+        //----------------------
+    }
     private void InstallWelcomePanel() {
         globalTabs.insertTab("Начало работы",
                 null,
@@ -105,10 +106,10 @@ public class MainForm extends Form implements MainWindow {
         }
     }
     private void InstallCredentialsPanel() {
-        globalTabs.insertTab("Учётные данные",
+        globalTabs.insertTab("Машины",
                 Utils.getIcon("/icons/Machine.png"),
                 (credentialsForm = new CredentialsForm()).getContent(),
-                "Машины, пользователи, компиляторы", 1);
+                "Машины, пользователи, компиляторы", 2);
     }
     private void SaveCredentialsPanel() {
         if (credentialsForm != null) {
@@ -116,25 +117,38 @@ public class MainForm extends Form implements MainWindow {
             credentialsForm = null;
         }
     }
+    private void InstallTestsPanel() {
+        globalTabs.insertTab("Тесты",
+                Utils.getIcon("/icons/Library.PNG"),
+                (testsForm = new TestsForm()).getContent(),
+                "Библиотека тестов на сервере", 3);
+    }
+    private void SaveTestsPanel() {
+        if (testsForm != null) {
+            testsForm.SaveSplitters();
+            testsForm = null;
+        }
+    }
     private void InstallTestingPanel() {
         testingForm = new TestingForm();
         ShowTestingTab();
     }
     @Override
     public void ShowTestingTab() {
-        if (globalTabs.getTabCount() < 4)
+        if (globalTabs.getTabCount() < 5)
             globalTabs.insertTab("Тестирование",
                     Utils.getIcon("/icons/Session.png"),
                     testingForm.getContent(),
-                    "Система тестирования", 3);
+                    "Система тестирования", 4);
     }
     @Override
     public void HideTestingTab() {
-        if (globalTabs.getTabCount() == 4)
-            globalTabs.removeTabAt(3);
+        if (globalTabs.getTabCount() == 5)
+            globalTabs.removeTabAt(4);
     }
     @Override
     public void ShowCredentials() {
+        /*
         String res = "";
         if (Current.HasMachine()) {
             res += "@" + Current.getMachine().getURL();
@@ -148,10 +162,12 @@ public class MainForm extends Form implements MainWindow {
                 testingTabs.setTitleAt(3, "DVM система: ?");
             }
              */
+        /*д
         } else {
             res += "?@?";
         }
         globalTabs.setTitleAt(2, res);
+    */
     }
     private void SaveTestingPanel() {
         if (testingForm != null) {
@@ -178,6 +194,10 @@ public class MainForm extends Form implements MainWindow {
         return credentialsForm;
     }
     @Override
+    public TestsWindow getTestsWindow() {
+        return testsForm;
+    }
+    @Override
     public void ShowUpdatesIcon() {
         UI.mainMenuBar.ShowUpdatesIcon();
     }
@@ -203,6 +223,7 @@ public class MainForm extends Form implements MainWindow {
         // иначе ссылка на главное окно в методах пустая.
         getCallbackWindow().ShowAll();
         getCredentialsWindow().ShowAll();
+        getTestsWindow().ShowAll();
         if (getTestingWindow() != null)
             getTestingWindow().ShowAll();
         UI.windowsStack.push(this);