From 4441864b6f953c15d2e1b22e9f87ea5a4cd1b7a4 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 28 Feb 2025 21:48:51 +0300
Subject: [PATCH] =?UTF-8?q?v++=20=D1=83=D0=B1=D0=B8=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BD=D0=B5=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF?=
 =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8E=20=D0=B2=D0=BA=D0=BB=D0=B0=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=BA,=20=D0=B8=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B5=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |   5 +-
 properties                                    |   6 +-
 src/_VisualDVM/Constants.java                 |   2 +-
 .../Visual/Interface/MainWindow.java          |   7 +-
 src/_VisualDVM/Visual/MainUI.java             |  12 +-
 src/_VisualDVM/Visual/Windows/MainForm.java   | 119 ++++++++++--------
 6 files changed, 84 insertions(+), 67 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f0525fba..57930ca2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,11 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Properties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Properties.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/MainWindow.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index ef785178..ca1ec36a 100644
--- a/properties
+++ b/properties
@@ -1,10 +1,10 @@
 {
-  "Email": "nataliku2@yandex.ru",
-  "Name": "Test",
+  "Email": "vmk-post@yandex.ru",
+  "Name": "M",
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": false,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests",
+  "ProjectsSearchDirectory": "E:\\BUG",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index ebe81f68..dc8bc819 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1185;
+    public static final int version = 1186;
     public static final int planner_version = 10;
     public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
     //--
diff --git a/src/_VisualDVM/Visual/Interface/MainWindow.java b/src/_VisualDVM/Visual/Interface/MainWindow.java
index df492154..0cb7dc8a 100644
--- a/src/_VisualDVM/Visual/Interface/MainWindow.java
+++ b/src/_VisualDVM/Visual/Interface/MainWindow.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Interface;
+import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
 public interface MainWindow {
     void Show();
     void ShowProject();
@@ -16,8 +17,10 @@ public interface MainWindow {
     void FocusCredentials();
     void FocusTests();
     void FocusTesting();
-    void SwitchTestingTabs(boolean flag);
-    void SwitchAdministrationTab(boolean flag);
     //-
     void ShowCheckedTestsCount();
+    void ShowUndefinedTabs();
+    void ShowUserTabs();
+    void ShowDeveloperTabs();
+    void ShowAdminTabs();
 }
diff --git a/src/_VisualDVM/Visual/MainUI.java b/src/_VisualDVM/Visual/MainUI.java
index 4067b857..27b4f162 100644
--- a/src/_VisualDVM/Visual/MainUI.java
+++ b/src/_VisualDVM/Visual/MainUI.java
@@ -102,8 +102,7 @@ public class MainUI extends UIModule_ {
     //---
     void showUndefinedRights(){
         Global.mainModule.SetUserPassesAccess();
-        getMainWindow().SwitchTestingTabs(false);
-        getMainWindow().SwitchAdministrationTab(false);
+        getMainWindow().ShowUndefinedTabs();
         getTestingMenuBar().showServerAdminLabel(false);
         getMainWindow().getCallbackWindow().showNoBugReports();
         Global.normalProperties.setControlVisible("AutoBugReportsLoad", false);
@@ -111,8 +110,7 @@ public class MainUI extends UIModule_ {
     };
     void showUserRights(){
         Global.mainModule.SetUserPassesAccess();
-        getMainWindow().SwitchTestingTabs(false);
-        getMainWindow().SwitchAdministrationTab(false);
+        getMainWindow().ShowUserTabs();
         getTestingMenuBar().showServerAdminLabel(false);
         getMainWindow().getCallbackWindow().showMyOnlyBugReports();
         Global.normalProperties.setControlVisible("AutoBugReportsLoad", true);
@@ -120,8 +118,7 @@ public class MainUI extends UIModule_ {
     };
     void showDeveloperRights(){
         Global.mainModule.SetDeveloperPassesAccess();
-        getMainWindow().SwitchTestingTabs(true);
-        getMainWindow().SwitchAdministrationTab(false);
+        getMainWindow().ShowDeveloperTabs();
         getTestingMenuBar().showServerAdminLabel(false);
         getMainWindow().getCallbackWindow().showAllBugreports();
         Global.normalProperties.setControlVisible("AutoBugReportsLoad", true);
@@ -129,8 +126,7 @@ public class MainUI extends UIModule_ {
     }
     void showAdminRights(){
         Global.mainModule.SetAdminPassesAccess();
-        getMainWindow().SwitchTestingTabs(true);
-        getMainWindow().SwitchAdministrationTab(true);
+        getMainWindow().ShowAdminTabs();
         getTestingMenuBar().showServerAdminLabel(true);
         getMainWindow().getCallbackWindow().showAllBugReportsAdmin(); //метод избыточный. возможно.
         Global.normalProperties.setControlVisible("AutoBugReportsLoad", true);
diff --git a/src/_VisualDVM/Visual/Windows/MainForm.java b/src/_VisualDVM/Visual/Windows/MainForm.java
index 13c40317..16b96c80 100644
--- a/src/_VisualDVM/Visual/Windows/MainForm.java
+++ b/src/_VisualDVM/Visual/Windows/MainForm.java
@@ -18,13 +18,13 @@ public class MainForm extends Form implements MainWindow {
     private final WelcomeForm welcomeForm = new WelcomeForm(); //заглушка когда проекта нет.
     int global_index = 0;
     //-----------------
-    private ProjectForm projectForm;
-    private CallbackForm callbackForm;
-    private CredentialsForm credentialsForm;
-    private TestsForm testsForm;
-    //---
-    private TestingForm testingForm;
-    private AdministrationForm administrationForm;
+    private ProjectForm projectForm = null;
+    private CallbackForm callbackForm = null;
+    private CredentialsForm credentialsForm = null; //машины пользователи компиляторы
+    //--- формы которые появлятся от прав
+    private TestsForm testsForm = null;
+    private TestingForm testingForm = null;
+    private AdministrationForm administrationForm = null;
     //-----------------
     private JPanel Content;
     private JTabbedPane globalTabs;
@@ -34,9 +34,6 @@ public class MainForm extends Form implements MainWindow {
         InstallWelcomePanel();
         InstallCallbackPanel();
         InstallCredentialsPanel();
-        InstallTestsPanel();
-        InstallTestingPanel();
-        InstallAdministrationPanel();
         ShowUpdatesIcon();
         //----------------------
     }
@@ -127,25 +124,12 @@ public class MainForm extends Form implements MainWindow {
                 (credentialsForm = new CredentialsForm()).getContent(),
                 "Машины, пользователи и компиляторы", 2);
     }
-    private void InstallTestsPanel() {
-        globalTabs.insertTab("Тесты",
-                Utils_.getIcon("/Common/icons/Library.png"),
-                (testsForm = new TestsForm()).getContent(),
-                "Библиотека тестов на сервере", 3);
-    }
     private void SaveTestsPanel() {
         if (testsForm != null) {
             testsForm.SaveSplitters();
             testsForm = null;
         }
     }
-    private void InstallTestingPanel() {
-        testingForm = new TestingForm();
-        globalTabs.insertTab("Тестирование",
-                Utils_.getIcon("/icons/Testing.png"),
-                testingForm.getContent(),
-                "Система тестирования", 4);
-    }
     @Override
     public void ShowCheckedTestsCount() {
         int res = 0;
@@ -190,10 +174,6 @@ public class MainForm extends Form implements MainWindow {
         return callbackForm;
     }
     @Override
-    public TestsWindow getTestsWindow() {
-        return testsForm;
-    }
-    @Override
     public void ShowUpdatesIcon() {
         Global.mainModule.getUI().mainMenuBar.ShowUpdatesIcon();
     }
@@ -218,31 +198,16 @@ public class MainForm extends Form implements MainWindow {
         globalTabs.setSelectedIndex(4);
     }
     @Override
-    public void SwitchTestingTabs(boolean flag) {
-        globalTabs.setEnabledAt(3, flag);
-        globalTabs.setEnabledAt(4, flag);
-    }
-    @Override
-    public void SwitchAdministrationTab(boolean flag) {
-        globalTabs.setEnabledAt(5, flag);
-    }
-    @Override
-    public TestingWindow getTestingWindow() {
-        return testingForm;
-    }
-    @Override
-    public AdministrationWindow getAdministrationWindow() {
-        return administrationForm;
-    }
-    @Override
     public void Show() {
         //приходится идти на это только ПОСЛЕ создания главного окна.
         // иначе ссылка на главное окно в методах пустая.
         Global.mainModule.getUI().ShowAccount();
         getCallbackWindow().ShowAll();
-        getTestsWindow().ShowAll();
         getCredentialsWindow().ShowAll();
-        if (getTestingWindow() != null)
+        //--->>>
+        if (testsForm != null)
+            getTestsWindow().ShowAll();
+        if (testingForm != null)
             getTestingWindow().ShowAll();
         if (Global.mainModule.getAccount().isAdmin())
             getAdministrationWindow().ShowAll();
@@ -272,16 +237,66 @@ public class MainForm extends Form implements MainWindow {
         restoreGlobalTab();
         Global.mainModule.getUI().mainMenuBar.ShowProject(false);
     }
-    private void InstallAdministrationPanel() {
-        globalTabs.insertTab("Администрирование",
-                Utils_.getIcon("/icons/Subscribe.png"),
-                (administrationForm = new AdministrationForm()).getContent(),
-                "Подписчики", 5);
-    }
     private void SaveAdministrationPanel() {
         if (administrationForm != null) {
             administrationForm.SaveSplitters();
             administrationForm = null;
         }
     }
+    //--
+    @Override
+    public TestsWindow getTestsWindow() {
+        if (testsForm == null)
+            testsForm = new TestsForm();
+        return testsForm;
+    }
+    @Override
+    public TestingWindow getTestingWindow() {
+        if (testingForm == null)
+            testingForm = new TestingForm();
+        return testingForm;
+    }
+    @Override
+    public AdministrationWindow getAdministrationWindow() {
+        if (administrationForm==null)
+            administrationForm= new AdministrationForm();
+        return administrationForm;
+    }
+    @Override
+    public void ShowUndefinedTabs()
+    {
+        //ничего не делаем. лишних панелей и так нет.
+    }
+    @Override
+    public void ShowUserTabs() {
+        //тоже ничего не делаем.
+    }
+    @Override
+    public void ShowDeveloperTabs() {
+        //добавить вкладки тестов и тестирования
+        globalTabs.insertTab("Тесты",
+                Utils_.getIcon("/Common/icons/Library.png"),
+                getTestsWindow().getContent(),
+                "Библиотека тестов на сервере", 3);
+        globalTabs.insertTab("Тестирование",
+                Utils_.getIcon("/icons/Testing.png"),
+                getTestingWindow().getContent(),
+                "Система тестирования", 4);
+    }
+    @Override
+    public void ShowAdminTabs() {
+        //добавить вкладки тестов, тестирования, администрирования
+        globalTabs.insertTab("Тесты",
+                Utils_.getIcon("/Common/icons/Library.png"),
+                getTestsWindow().getContent(),
+                "Библиотека тестов на сервере", 3);
+        globalTabs.insertTab("Тестирование",
+                Utils_.getIcon("/icons/Testing.png"),
+                getTestingWindow().getContent(),
+                "Система тестирования", 4);
+        globalTabs.insertTab("Администрирование",
+                Utils_.getIcon("/icons/Subscribe.png"),
+                getAdministrationWindow().getContent(),
+                "Подписчики", 5);
+    }
 }