From 2b52763c0278ffb3b89dddc3fe460452f9298f0a Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 5 Dec 2023 19:25:17 +0300
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B8=20=D0=BE=20=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=BA=D0=B5=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20=D0=BD=D0=B0=20=D0=BC?=
 =?UTF-8?q?=D0=B0=D1=88=D0=B8=D0=BD=D0=B5=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7?=
 =?UTF-8?q?=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD=D0=BA=D1=83.=20=D0=BD=D1=83?=
 =?UTF-8?q?=D0=B6=D0=BD=D0=BE=20=D0=B1=D1=83=D0=B4=D0=B5=D1=82=20=D0=BA?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B9=D0=BD=D0=B5=20=D1=80=D0=B5=D0=B4=D0=BA=D0=BE?=
 =?UTF-8?q?,=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BD=D0=B0=D0=BF=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=80=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=81=D1=8C=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B8.=20?=
 =?UTF-8?q?=D0=9F=D0=BE=D0=BA=D0=B0=20=D0=BD=D0=B5=20=D1=80=D0=B5=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B0=20=D0=BE=D1=87?=
 =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20=D0=BD=D0=B0=20=D1=86=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=B2=D0=BE=D0=B9=20=D0=BC=D0=B0=D1=88=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=B5,=20=D0=BD=D0=BE=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=B8=20=D0=BD=D0=B5=20=D0=BF=D0=BE=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B8=D1=82=D1=81=D1=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                               | 15 +++++----------
 properties                                        |  2 +-
 .../SubscriberWorkspacesMenuBar.java              |  3 ++-
 src/Repository/Subscribes/SubsribersDBTable.java  |  2 +-
 .../Passes/All/DeleteSubscriberWorkspace.java     | 10 ++++++++++
 .../Passes/All/SynchronizeBugReports.java         |  4 ++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java     |  3 +++
 src/Visual_DVM_2021/UI/Main/CallbackForm.java     |  9 +++++++++
 8 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/DeleteSubscriberWorkspace.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 468cb652..521bfa2b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,18 +7,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriberWorkspace.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/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.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/Repository/SubscriberWorkspace/SubscriberWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspace.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/Subscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/Subscriber.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/properties b/properties
index 1570469b..89acc64f 100644
--- a/properties
+++ b/properties
@@ -25,7 +25,7 @@
   "InstructionPath": "",
   "PerformanceAnalyzerPath": "",
   "ComponentsBackUpsCount": 10,
-  "TestingKernels": 28,
+  "TestingKernels": 64,
   "AutoCheckTesting": false,
   "CheckTestingIntervalSeconds": 10,
   "EmailOnTestingProgress": true
diff --git a/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java b/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java
index b1afa11f..92de34bf 100644
--- a/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java
+++ b/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java
@@ -1,7 +1,8 @@
 package Common.UI.Menus_2023.SubscriberWorkspacesMenuBar;
 import Common.UI.Menus_2023.DataMenuBar;
+import Visual_DVM_2021.Passes.PassCode_2021;
 public class SubscriberWorkspacesMenuBar extends DataMenuBar {
     public SubscriberWorkspacesMenuBar() {
-        super("рабочие пространства");
+        super("рабочие пространства", PassCode_2021.DeleteSubscriberWorkspace);
     }
 }
diff --git a/src/Repository/Subscribes/SubsribersDBTable.java b/src/Repository/Subscribes/SubsribersDBTable.java
index a39ae803..941e6816 100644
--- a/src/Repository/Subscribes/SubsribersDBTable.java
+++ b/src/Repository/Subscribes/SubsribersDBTable.java
@@ -62,7 +62,7 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
     public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
         LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
         //-
-        res.put(SubscriberWorkspace.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
+        res.put(SubscriberWorkspace.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
         return res;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSubscriberWorkspace.java b/src/Visual_DVM_2021/Passes/All/DeleteSubscriberWorkspace.java
new file mode 100644
index 00000000..3b4e57f8
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSubscriberWorkspace.java
@@ -0,0 +1,10 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Global;
+import Repository.Server.ComponentsServer;
+import Repository.SubscriberWorkspace.SubscriberWorkspace;
+import Visual_DVM_2021.Passes.Server.DeleteServerObject;
+public class DeleteSubscriberWorkspace  extends DeleteServerObject<ComponentsServer, SubscriberWorkspace> {
+    public DeleteSubscriberWorkspace() {
+        super(Global.componentsServer, SubscriberWorkspace.class);
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java b/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java
index e00b5070..027e0df7 100644
--- a/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java
+++ b/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java
@@ -27,6 +27,8 @@ public class SynchronizeBugReports extends ComponentsRepositoryPass<Object> {
     protected void showPreparation() throws Exception {
         server.db.bugReports.SaveLastSelections();
         server.db.bugReports.ClearUI();
+        server.db.subscribers.ClearUI();
+        server.db.workspaces.ClearUI();
     }
     @Override
     protected void ServerAction() throws Exception {
@@ -48,6 +50,8 @@ public class SynchronizeBugReports extends ComponentsRepositoryPass<Object> {
         if (UI.HasMainWindow()) {
             UI.getMainWindow().getCallbackWindow().ShowBugReports();
             Global.componentsServer.db.bugReports.RestoreLastSelections();
+            server.db.subscribers.RestoreLastSelections();
+            server.db.workspaces.RestoreLastSelections();
         }
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 47b002eb..3bf1ca69 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -304,12 +304,15 @@ public enum PassCode_2021 {
     CreateTestsFromFiles,
     CreateGroupFromFiles,
     DeleteTasksPackage,
+    DeleteSubscriberWorkspace,
     //->
     TestPass;
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
+            case DeleteSubscriberWorkspace:
+                return "Удалить рабочее пространство пользователя";
             case DeleteTasksPackage:
                 return "Удалить пакет задач";
             case CreateGroupFromFiles:
diff --git a/src/Visual_DVM_2021/UI/Main/CallbackForm.java b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
index 67610107..2c868199 100644
--- a/src/Visual_DVM_2021/UI/Main/CallbackForm.java
+++ b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
@@ -371,6 +371,9 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         Pass_2021.passes.get(PassCode_2021.EditSubscriber).setControlsVisible(false);
         Pass_2021.passes.get(PassCode_2021.DeleteSubscriber).setControlsVisible(false);
         Pass_2021.passes.get(PassCode_2021.DownloadAllBugReportsArchives).setControlsVisible(false);
+        Pass_2021.passes.get(PassCode_2021.DeleteSubscriberWorkspace).setControlsVisible(false);
+        Pass_2021.passes.get(PassCode_2021.InstallServerSapfor).setControlsVisible(false);
+        Pass_2021.passes.get(PassCode_2021.DeleteServerSapfor).setControlsVisible(false);
     }
     private void setDeveloperRights() {
         UnlockMyOnly();
@@ -378,6 +381,9 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         Pass_2021.passes.get(PassCode_2021.EditSubscriber).setControlsVisible(false);
         Pass_2021.passes.get(PassCode_2021.DeleteSubscriber).setControlsVisible(false);
         Pass_2021.passes.get(PassCode_2021.DownloadAllBugReportsArchives).setControlsVisible(true);
+        Pass_2021.passes.get(PassCode_2021.DeleteSubscriberWorkspace).setControlsVisible(false);
+        Pass_2021.passes.get(PassCode_2021.InstallServerSapfor).setControlsVisible(false);
+        Pass_2021.passes.get(PassCode_2021.DeleteServerSapfor).setControlsVisible(false);
     }
     @Override
     public void setAdminRights() {
@@ -386,6 +392,9 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         Pass_2021.passes.get(PassCode_2021.EditSubscriber).setControlsVisible(true);
         Pass_2021.passes.get(PassCode_2021.DeleteSubscriber).setControlsVisible(true);
         Pass_2021.passes.get(PassCode_2021.DownloadAllBugReportsArchives).setControlsVisible(true);
+        Pass_2021.passes.get(PassCode_2021.DeleteSubscriberWorkspace).setControlsVisible(true);
+        Pass_2021.passes.get(PassCode_2021.InstallServerSapfor).setControlsVisible(true);
+        Pass_2021.passes.get(PassCode_2021.DeleteServerSapfor).setControlsVisible(true);
     }
     @Override
     public void ShowAccount() {