From 20e82075b720f444888200c8fd6d5e117c67a18d Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 6 Feb 2025 18:31:18 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B5=D0=B7=D0=BE=D0=BF=D0=B0?=
 =?UTF-8?q?=D1=81=D0=BD=D0=BE=D1=81=D1=82=D0=B8.=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=B6=D1=83=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 21 +++++++++---------
 properties                                    |  2 +-
 src/Common/Passes/Pass.java                   |  8 ++++++-
 src/Common/Visual/Controls/PassButton.java    |  2 +-
 src/Common/Visual/Controls/PassControl.java   |  1 +
 src/Common/Visual/Controls/PassMenuItem.java  |  2 +-
 .../Visual/Controls/StablePassMenuItem.java   |  2 +-
 src/_VisualDVM/MainModule.java                |  4 +++-
 .../Visual/Interface/CallbackWindow.java      |  1 +
 .../Visual/Windows/CallbackForm.java          | 22 +++++++++++++------
 src/_VisualDVM/Visual/Windows/MainForm.java   |  1 -
 11 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7a8bc18b..69da2b34 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,18 +7,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PauseDVMPackage.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResumeDVMPackage.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/icons/Resume.png" 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/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" 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/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TasksPackageState.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/PassButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/PassButton.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/PassControl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/PassControl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/PassMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/PassMenuItem.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/StablePassMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/StablePassMenuItem.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/CallbackWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/CallbackWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.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 81f2dc41..e569052b 100644
--- a/properties
+++ b/properties
@@ -1,6 +1,6 @@
 {
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
+  "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/Common/Passes/Pass.java b/src/Common/Passes/Pass.java
index 9ff4d62a..db6191a5 100644
--- a/src/Common/Passes/Pass.java
+++ b/src/Common/Passes/Pass.java
@@ -20,7 +20,12 @@ public class Pass<T> {
     public PassState state = PassState.Inactive; //текущее состояние прохода.
     public Semaphore animation_sem;
     //--------------
+    public boolean ui_visible = true;
     public Vector<PassControl> controls = new Vector<>();
+    public void addControl(PassControl control_in){
+        control_in.setVisible(ui_visible);
+        controls.add(control_in);
+    }
     public TextLog Log; //внутренний журнал прохода.
     protected boolean interrupt;
     protected SwingWorker dispatcher = null;
@@ -74,8 +79,9 @@ public class Pass<T> {
             control.setEnabled(flag);
     }
     public void setControlsVisible(boolean flag) {
+        ui_visible =flag;
         for (PassControl control : controls)
-            control.setVisible(flag);
+            control.setVisible(ui_visible);
     }
     public void setControlsToolTipText(String text) {
         for (PassControl control : controls)
diff --git a/src/Common/Visual/Controls/PassButton.java b/src/Common/Visual/Controls/PassButton.java
index 23b93436..cbd4ee76 100644
--- a/src/Common/Visual/Controls/PassButton.java
+++ b/src/Common/Visual/Controls/PassButton.java
@@ -16,7 +16,7 @@ public class PassButton extends MenuBarButton implements PassControl {
                 setIcon(pass.getIconPath());
         }
         addActionListener(pass.getControlAction());
-        pass.controls.add(this);
+        pass.addControl(this);
     }
     public PassButton(Pass pass) {
         this(pass, false);
diff --git a/src/Common/Visual/Controls/PassControl.java b/src/Common/Visual/Controls/PassControl.java
index 4332146f..4dda2e29 100644
--- a/src/Common/Visual/Controls/PassControl.java
+++ b/src/Common/Visual/Controls/PassControl.java
@@ -1,4 +1,5 @@
 package Common.Visual.Controls;
+import Common.Passes.Pass;
 public interface PassControl {
     void setIcon(String icon_path);
     void setEnabled(boolean flag);
diff --git a/src/Common/Visual/Controls/PassMenuItem.java b/src/Common/Visual/Controls/PassMenuItem.java
index 102d13ea..e1f30d5e 100644
--- a/src/Common/Visual/Controls/PassMenuItem.java
+++ b/src/Common/Visual/Controls/PassMenuItem.java
@@ -8,7 +8,7 @@ public class PassMenuItem extends VisualiserMenuItem implements PassControl {
         setToolTipText(pass.getDescription());
         if (pass.getIconPath() != null) setIcon(pass.getIconPath());
         addActionListener(pass.getControlAction());
-        pass.controls.add(this);
+        pass.addControl(this);
     }
     @Override
     public void setIcon(String icon_path) {
diff --git a/src/Common/Visual/Controls/StablePassMenuItem.java b/src/Common/Visual/Controls/StablePassMenuItem.java
index 86b5f4f4..08cfad9d 100644
--- a/src/Common/Visual/Controls/StablePassMenuItem.java
+++ b/src/Common/Visual/Controls/StablePassMenuItem.java
@@ -7,7 +7,7 @@ public class StablePassMenuItem extends StableMenuItem implements PassControl {
         setToolTipText(pass.getDescription());
         if (pass.getIconPath() != null) setIcon(pass.getIconPath());
         addActionListener(pass.getControlAction());
-        pass.controls.add(this);
+        pass.addControl(this);
     }
     @Override
     public void setIcon(String icon_path) {
diff --git a/src/_VisualDVM/MainModule.java b/src/_VisualDVM/MainModule.java
index 72ef24d3..14dd9d54 100644
--- a/src/_VisualDVM/MainModule.java
+++ b/src/_VisualDVM/MainModule.java
@@ -34,7 +34,8 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
             //
             PassCode.ShutdownTestingServer,
             PassCode.StartTestingServer,
-            PassCode.PublishTestingServer
+            PassCode.PublishTestingServer,
+            PassCode.CreateTestsGroupFromSelectedVersions
     );
     public MainModule() throws Exception {
         super(GlobalDatabase.class, MainUI.class);
@@ -147,6 +148,7 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
     }
     public void SetDeveloperPassesAccess() {
         SetUserPassesAccess();
+        getPass(PassCode.CreateTestsGroupFromSelectedVersions).setControlsVisible(true);
         getPass(PassCode.DownloadAllBugReportsArchives).setControlsVisible(true);
     }
     public void SetAdminPassesAccess() {
diff --git a/src/_VisualDVM/Visual/Interface/CallbackWindow.java b/src/_VisualDVM/Visual/Interface/CallbackWindow.java
index 43a1a27c..8b443f97 100644
--- a/src/_VisualDVM/Visual/Interface/CallbackWindow.java
+++ b/src/_VisualDVM/Visual/Interface/CallbackWindow.java
@@ -24,6 +24,7 @@ public interface CallbackWindow extends VisualizerForm {
     void ClearBugReportCommentAdditionText();
     void FocusRecipients();
     void SwitchScreen(boolean small);
+    void setUdefinedRights();
     void setUserRights();
     void setAdminRights();
 }
diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.java b/src/_VisualDVM/Visual/Windows/CallbackForm.java
index 3d15cfed..727c63b4 100644
--- a/src/_VisualDVM/Visual/Windows/CallbackForm.java
+++ b/src/_VisualDVM/Visual/Windows/CallbackForm.java
@@ -366,6 +366,15 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         Global.mainModule.getUI().getMainWindow().SwitchTestingTabs(true);
     }
     @Override
+    public void setUdefinedRights(){
+        Global.mainModule.SetUserPassesAccess();
+        UI.Clear(accountPanel);
+        accountPanel.add(new CallbackWelcomeForm().content);
+        Global.mainModule.getUI().getMainWindow().SwitchTestingTabs(false);
+        Global.mainModule.getUI().getTestingMenuBar().showServerAdminLabel(false);
+        adminLabel.setVisible(false);
+    }
+    @Override
     public void setUserRights() {
         LockMyOnly();
         Global.mainModule.SetUserPassesAccess();
@@ -391,17 +400,16 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         lAccountName.setText(Utils_.Brackets(Global.mainModule.getAccount().name));
         lAccountMail.setText(Utils_.Brackets(Global.mainModule.getAccount().email));
         lAccountRole.setText(Utils_.Brackets(Global.mainModule.getAccount().role.getDescription()));
+        System.out.println("ROLE IS "+Global.mainModule.getAccount().role);
         switch (Global.mainModule.getAccount().role) {
             case Undefined:
-                ///  UI.Clear(accountPanel);
-                //  accountPanel.add(new CallbackWelcomeForm().content);
-                //  UI.getMainWindow().SwitchTestingTabs(false);
-                //  break;
+                 setUdefinedRights();
+                 break;
             case User:
                 //видит только свои баги.
-                //    EnableBugreports();
-                //     setUserRights();
-                //     break;
+                   EnableBugreports();
+                   setUserRights();
+                 break;
             case Developer:
                 EnableBugreports();
                 setDeveloperRights();
diff --git a/src/_VisualDVM/Visual/Windows/MainForm.java b/src/_VisualDVM/Visual/Windows/MainForm.java
index 2249e01b..d7cbb828 100644
--- a/src/_VisualDVM/Visual/Windows/MainForm.java
+++ b/src/_VisualDVM/Visual/Windows/MainForm.java
@@ -218,7 +218,6 @@ public class MainForm extends Form implements MainWindow {
     public void SwitchTestingTabs(boolean flag) {
         globalTabs.setEnabledAt(3, flag);
         globalTabs.setEnabledAt(4, flag);
-        // globalTabs.setEnabledAt(4, flag);
     }
     @Override
     public TestingWindow getTestingWindow() {