промежуточный. перенос вкладок

src/Visual_DVM_2021/UI/Main/MainForm.java

@@ -22,7 +22,6 @@ public class MainForm extends Form implements MainWindow {
     //-----------------
     private ProjectForm projectForm;
     private CallbackForm callbackForm;
-    private CredentialsForm credentialsForm;
     private TestsForm testsForm;
     //---
     private TestingForm testingForm;
@@ -56,7 +55,6 @@ public class MainForm extends Form implements MainWindow {
         if (UI.getVersionsWindow() != null)
             ((VersionsForm) UI.getVersionsWindow()).SaveSplitters();
         SaveCallbackPanel();
-        SaveCredentialsPanel();
         SaveTestsPanel();
         SaveTestingPanel();
         //--
@@ -71,7 +69,6 @@ public class MainForm extends Form implements MainWindow {
         mainPanel.add(UI.mainMenuBar, BorderLayout.NORTH);
         InstallWelcomePanel();
         InstallCallbackPanel();
-        InstallCredentialsPanel();
         InstallTestsPanel();
         InstallTestingPanel();
         ShowUpdatesIcon();
@@ -114,23 +111,11 @@ public class MainForm extends Form implements MainWindow {
             callbackForm = null;
         }
     }
-    private void InstallCredentialsPanel() {
-        globalTabs.insertTab("Машины",
-                Utils.getIcon("/icons/Machine.png"),
-                (credentialsForm = new CredentialsForm()).getContent(),
-                "Машины, пользователи, компиляторы", 2);
-    }
-    private void SaveCredentialsPanel() {
-        if (credentialsForm != null) {
-            credentialsForm.SaveSplitters();
-            credentialsForm = null;
-        }
-    }
     private void InstallTestsPanel() {
         globalTabs.insertTab("Тесты",
                 Utils.getIcon("/icons/Library.PNG"),
                 (testsForm = new TestsForm()).getContent(),
-                "Библиотека тестов на сервере", 3);
+                "Библиотека тестов на сервере", 2);
     }
     private void SaveTestsPanel() {
         if (testsForm != null) {
@@ -143,7 +128,7 @@ public class MainForm extends Form implements MainWindow {
         globalTabs.insertTab("Тестирование",
                 Utils.getIcon("/icons/Session.png"),
                 testingForm.getContent(),
-                "Система тестирования", 4);
+                "Система тестирования", 3);
     }
   /*
     public void ShowCurrentCompiler() {
@@ -209,10 +194,6 @@ public class MainForm extends Form implements MainWindow {
         return callbackForm;
     }
     @Override
-    public CredentialsWindow getCredentialsWindow() {
-        return credentialsForm;
-    }
-    @Override
     public TestsWindow getTestsWindow() {
         return testsForm;
     }
@@ -229,22 +210,18 @@ public class MainForm extends Form implements MainWindow {
         globalTabs.setSelectedIndex(1);
     }
     @Override
-    public void FocusCredentials() {
+    public void FocusTests() {
         globalTabs.setSelectedIndex(2);
     }
     @Override
-    public void FocusTests() {
-        globalTabs.setSelectedIndex(3);
-    }
-    @Override
     public void FocusTesting() {
-        globalTabs.setSelectedIndex(4);
+        globalTabs.setSelectedIndex(3);
     }
     @Override
     public void SwitchTestingTabs(boolean flag) {
         globalTabs.setEnabledAt(2, flag);
         globalTabs.setEnabledAt(3, flag);
-        globalTabs.setEnabledAt(4, flag);
+       // globalTabs.setEnabledAt(4, flag);
     }
     @Override
     public TestingWindow getTestingWindow() {
@@ -255,7 +232,6 @@ public class MainForm extends Form implements MainWindow {
         //приходится идти на это только ПОСЛЕ создания главного окна.
         // иначе ссылка на главное окно в методах пустая.
         getCallbackWindow().ShowAll();
-        getCredentialsWindow().ShowAll();
         getTestsWindow().ShowAll();
         if (getTestingWindow() != null)
             getTestingWindow().ShowAll();