From b9132782eb9ce808f3c05c4dc0efcdb9a67fbcb1 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 20 Nov 2023 00:15:22 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B2=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5?=
 =?UTF-8?q?=20=D0=B1=D0=B0=D0=B3=D0=B8,=20=D1=81=D0=B2=D1=8F=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B5=20=D1=81=20=D1=81=D0=BE=D0=B7=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=D0=BC=20=D1=82=D0=B5=D1=81=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=B8=D0=B7=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B9=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 38 +++++-------
 .../UI/Menus_2023/MainMenuBar/MainWindow.java |  1 +
 .../Menus_2023/TestsMenuBar/TestsMenuBar.java |  1 +
 .../Passes/All/CreateTestFromDirectory.java   | 20 ++++++
 .../CreateTestsGroupFromSelectedVersions.java | 62 ++++++++++++-------
 .../Passes/All/DeleteSubscriber.java          | 18 ++----
 .../Passes/All/DeleteSubscriberOnServer.java  | 22 -------
 .../Passes/All/EditSubscriber.java            | 28 ++-------
 .../Passes/All/EditSubscriberOnServer.java    | 28 ---------
 .../Passes/All/PublishTest.java               | 18 +-----
 .../All/SPF_GetMaxMinBlockDistribution.java   |  2 +
 src/Visual_DVM_2021/Passes/PassCode_2021.java | 11 ++--
 .../Passes/Server/DeleteServerObject.java     |  4 +-
 .../Passes/Server/EditServerObject.java       |  4 +-
 .../Server/PublishServerAccountObject.java    |  4 +-
 .../Passes/Server/PublishServerObject.java    | 12 ++--
 .../UI/Interface/TestingWindow.java           |  2 -
 src/Visual_DVM_2021/UI/Main/MainForm.java     |  4 ++
 src/Visual_DVM_2021/UI/Main/TestingForm.java  |  4 --
 19 files changed, 114 insertions(+), 169 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
 delete mode 100644 src/Visual_DVM_2021/Passes/All/DeleteSubscriberOnServer.java
 delete mode 100644 src/Visual_DVM_2021/Passes/All/EditSubscriberOnServer.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 71ece427..5c205789 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,29 +7,25 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortTaskPackage.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TasksDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTaskInterface.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.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/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSelectedPackages.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SwitchTestingEmail.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriberOnServer.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSubscriber.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSubscriberOnServer.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.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/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java b/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
index 59616231..f42213d4 100644
--- a/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
+++ b/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
@@ -13,6 +13,7 @@ public interface MainWindow {
     void ShowUpdatesIcon();
     void FocusProject();
     void FocusCallback();
+    void FocusTests();
     void FocusTesting();
 
     void ShowTestingTab();
diff --git a/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java b/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
index 5c4a283f..8b0333c2 100644
--- a/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
+++ b/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
@@ -6,6 +6,7 @@ public class TestsMenuBar extends DataMenuBar {
         super("тесты",
                 PassCode_2021.DownloadTest,
                 PassCode_2021.PublishTest,
+                PassCode_2021.CreateTestFromDirectory,
                 PassCode_2021.EditTest,
                 PassCode_2021.DeleteTest);
     }
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
new file mode 100644
index 00000000..4d4a2df0
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
@@ -0,0 +1,20 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Utils.Files.VDirectoryChooser;
+import TestingSystem.Common.Test.Test;
+import Visual_DVM_2021.Passes.Pass_2021;
+public class CreateTestFromDirectory extends Pass_2021<Test> {
+    VDirectoryChooser directoryChooser = new VDirectoryChooser("Выбор домашней папки теста");
+    @Override
+    public String getIconPath() {
+        return "/icons/OpenProject.png";
+    }
+    @Override
+    public String getButtonText() {
+        return "";
+    }
+    @Override
+    protected boolean needsAnimation() {
+        return true;
+    }
+
+}
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
index 51e15570..f317cbb6 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
@@ -1,19 +1,18 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Constants;
 import Common.Current;
 import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import ProjectData.Project.db_project_info;
-import TestingSystem.Common.Group.Group;
-import TestingSystem.Common.Test.Test;
 import TestingSystem.Common.Test.TestType;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
 import java.util.Vector;
 public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_project_info>> {
-    Group group;
-    Test test;
+    int group_id;
+    int test_id;
     @Override
     protected boolean needsAnimation() {
         return true;
@@ -28,6 +27,8 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
+        group_id = Constants.Nan;
+        test_id = Constants.Nan;
         if (!Current.getAccount().CheckRegistered(Log))
             return false;
         if (!Global.versions_multiselection) {
@@ -35,8 +36,6 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
             return false;
         }
         target = new Vector<>();
-        group = null;
-        test = null;
         Current.getRoot().getSelectedVersions(target);
         if (target.size() == 0) {
             Log.Writeln_("Не отмечено ни одной версии.");
@@ -87,7 +86,7 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
         };
         ShowMessage1("Публикация группы ");
         if (publishGroup.Do()) {
-            group = publishGroup.target;
+            group_id = (int) publishGroup.pk;
             for (db_project_info vizTestProject : target) {
                 //на случай если версия в текущем сеансе еще не открывалась.
                 vizTestProject.Open();
@@ -99,18 +98,25 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
                         return false;
                     }
                     @Override
-                    public boolean fillObjectFields() throws Exception {
+                    public boolean setProject() {
                         project = vizTestProject;
-                        if (project.checkSubdirectories(Log)) {
+                        return true;
+                    }
+                    @Override
+                    public boolean fillObjectFields() throws Exception {
+                        if (setProject() && project.checkSubdirectories(Log)) {
+                            target.description = project.getLocalName() + " " + project.description;
+                            target.group_id = group_id;
                             switch (project.languageName) {
                                 case fortran:
-                                    project.testMaxDim = Current.getSapfor().getTextMaxDim(null, project);
-                                    break;
+                                    target.dim = Current.getSapfor().getTextMaxDim(null, project);
+                                    return true;
+                                case c:
+                                    target.dim = Utils.getCProjectMaxDim(project);
+                                    return true;
                                 default:
-                                    project.testMaxDim = 0;
-                                    break;
+                                    return false;
                             }
-                            return true;
                         }
                         return false;
                     }
@@ -118,19 +124,31 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
                     public String getDescription() {
                         return "Добавление версии " + vizTestProject.name;
                     }
+                    @Override
+                    protected void performDone() throws Exception {
+                        test_id = (int) pk;
+                    }
+                    @Override
+                    protected void showDone() throws Exception {
+                    }
                 };
-                if (pass.Do())
-                    test = pass.target;
-            }
-            if (passes.get(PassCode_2021.SynchronizeTests).Do()) {
-                if (group != null) Global.testingServer.db.groups.ui_.Show(group.getPK());
-                if (test != null) Global.testingServer.db.tests.ui_.Show(test.getPK());
+                if (!pass.Do()) return;
             }
         }
     }
     @Override
+    protected void performFinish() throws Exception {
+        super.performDone();
+        passes.get(PassCode_2021.SynchronizeTests).Do();
+    }
+    @Override
+    protected void showDone() throws Exception {
+        super.showDone();
+        Global.testingServer.db.groups.ui_.Show(group_id);
+        Global.testingServer.db.tests.ui_.Show(test_id);
+    }
+    @Override
     protected void FocusResult() {
-        UI.getMainWindow().FocusTesting();
-        UI.getMainWindow().getTestingWindow().FocusTestingSystem();
+        UI.getMainWindow().FocusTests();
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java b/src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java
index b81e8aa0..41b3d5b9 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java
@@ -1,20 +1,10 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Database.Database;
 import Common.Global;
+import Repository.Server.ComponentsServer;
 import Repository.Subscribes.Subscriber;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
-public class DeleteSubscriber extends DeleteObjectPass<Subscriber> {
+import Visual_DVM_2021.Passes.Server.DeleteServerObject;
+public class DeleteSubscriber extends DeleteServerObject<ComponentsServer,Subscriber> {
     public DeleteSubscriber() {
-        super(Subscriber.class);
-    }
-    @Override
-    protected Database getDb() {
-        return Global.componentsServer.db;
-    }
-    @Override
-    protected void performDone() throws Exception {
-        super.performDone();
-        passes.get(PassCode_2021.DeleteSubscriberOnServer).Do(target);
+        super(Global.componentsServer, Subscriber.class);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSubscriberOnServer.java b/src/Visual_DVM_2021/Passes/All/DeleteSubscriberOnServer.java
deleted file mode 100644
index 42f2e8fb..00000000
--- a/src/Visual_DVM_2021/Passes/All/DeleteSubscriberOnServer.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Repository.Subscribes.Subscriber;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
-public class DeleteSubscriberOnServer extends ComponentsRepositoryPass<Subscriber> {
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        target = (Subscriber) args[0];
-        return true;
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.DeleteObject, "", target));
-    }
-    @Override
-    protected void performFinish() throws Exception {
-        super.performFinish();
-        passes.get(PassCode_2021.SynchronizeBugReports).Do();
-    }
-}
diff --git a/src/Visual_DVM_2021/Passes/All/EditSubscriber.java b/src/Visual_DVM_2021/Passes/All/EditSubscriber.java
index 85e4feb8..e0dc5016 100644
--- a/src/Visual_DVM_2021/Passes/All/EditSubscriber.java
+++ b/src/Visual_DVM_2021/Passes/All/EditSubscriber.java
@@ -1,30 +1,10 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Current;
-import Common.Database.Database;
 import Common.Global;
+import Repository.Server.ComponentsServer;
 import Repository.Subscribes.Subscriber;
-import Visual_DVM_2021.Passes.EditObjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
-public class EditSubscriber extends EditObjectPass<Subscriber> {
+import Visual_DVM_2021.Passes.Server.EditServerObject;
+public class EditSubscriber extends EditServerObject<ComponentsServer,Subscriber> {
     public EditSubscriber() {
-        super(Subscriber.class);
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (Current.Check(Log, Current.Subscriber)){
-            target = Current.getSubscriber();
-            return getTable().ShowEditObjectDialog(target);
-        }
-        return false;
-    }
-    @Override
-    protected Database getDb() {
-        return Global.componentsServer.db;
-    }
-    @Override
-    protected void performDone() throws Exception {
-        super.performDone();
-        //отправка.
-        passes.get(PassCode_2021.EditSubscriberOnServer).Do(target);
+        super(Global.componentsServer, Subscriber.class);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/EditSubscriberOnServer.java b/src/Visual_DVM_2021/Passes/All/EditSubscriberOnServer.java
deleted file mode 100644
index a0411732..00000000
--- a/src/Visual_DVM_2021/Passes/All/EditSubscriberOnServer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Repository.Subscribes.Subscriber;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
-public class EditSubscriberOnServer  extends ComponentsRepositoryPass<Subscriber> {
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        target = (Subscriber) args[0];
-        return true;
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", target));
-    }
-
-    @Override
-    protected void performFinish() throws Exception {
-        super.performFinish();
-        passes.get(PassCode_2021.SynchronizeBugReports).Do();
-    }
-    @Override
-    protected void showDone() throws Exception {
-        super.showDone();
-        server.db.subscribers.ui_.Show(target.getPK());
-    }
-}
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTest.java b/src/Visual_DVM_2021/Passes/All/PublishTest.java
index 88534b84..7d6644aa 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishTest.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishTest.java
@@ -2,7 +2,6 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.Global;
 import Common.UI.UI;
-import Common.Utils.Utils;
 import ProjectData.Project.db_project_info;
 import TestingSystem.Common.Test.Test;
 import TestingSystem.Common.TestingServer;
@@ -14,26 +13,15 @@ public class PublishTest extends PublishServerObject<TestingServer, Test> {
     }
     db_project_info project = null;
     protected boolean setProject() {
-        if (Current.Check(Log, Current.Group, Current.Project)
-                && UI.Question("Добавить текущий проект в глобальную базу тестов")) {
+        if (Current.Check(Log, Current.Group, Current.Project) && UI.Question("Добавить текущий проект в глобальную базу тестов")) {
             project = Current.getProject();
-            if (project.checkSubdirectories(Log)) {
-                switch (project.languageName) {
-                    case fortran:
-                        return passes.get(PassCode_2021.SPF_GetMaxMinBlockDistribution).Do();
-                    case c:
-                        project.testMaxDim = Utils.getCProjectMaxDim(project);
-                        return true;
-                    default:
-                        return false;
-                }
-            }
+            return true;
         }
         return false;
     }
     @Override
     public boolean fillObjectFields() throws Exception {
-        if (setProject()) {
+        if (setProject()&&project.checkSubdirectories(Log)) {
             target.description = project.getLocalName() + " " + project.description;
             target.dim = project.testMaxDim;
             target.group_id = Current.getGroup().id;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.java b/src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.java
index 2b6cbdef..b4a4937b 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
+import Common.UI.UI;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.SilentSapforPass;
 public class SPF_GetMaxMinBlockDistribution extends SilentSapforPass {
@@ -14,6 +15,7 @@ public class SPF_GetMaxMinBlockDistribution extends SilentSapforPass {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         if (super.canStart(args)){
+            UI.Info("+");
             SPF_ParseFilesWithOrder.silent = true;
             return (passes.get(PassCode_2021.SPF_ParseFilesWithOrder).isDone() || passes.get(PassCode_2021.SPF_ParseFilesWithOrder).Do());
         }
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index df556caa..1650c170 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -24,9 +24,7 @@ public enum PassCode_2021 {
     EditAccount,
     AddSubscriber,
     EditSubscriber,
-    EditSubscriberOnServer,
     DeleteSubscriber,
-    DeleteSubscriberOnServer,
     //----
     SetSelectedFilesLanguage,
     SetSelectedFilesStyle,
@@ -262,7 +260,6 @@ public enum PassCode_2021 {
     GetTestsQueueSize,
     ApplyCurrentFunction,
     //->
-    // GetRemoteUserHome,
     CheckRemoteWorkspace,
     PublishRemoteWorkspace,
     //->
@@ -299,12 +296,16 @@ public enum PassCode_2021 {
     DeleteTest,
     DeleteConfiguration,
     AbortTaskPackage,
+    //--
+    CreateTestFromDirectory,
     //->
     TestPass;
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
+            case CreateTestFromDirectory:
+                return "Создать тест из папки";
             case AbortTaskPackage:
                 return "Прерывать пакет тестирования DVM";
             case DeleteConfiguration:
@@ -365,10 +366,6 @@ public enum PassCode_2021 {
                 return "Редактировать учётную запись";
             case DeleteSubscriber:
                 return "Удалить учётную запись";
-            case DeleteSubscriberOnServer:
-                return "Удалить учётную запись на сервере";
-            case EditSubscriberOnServer:
-                return "Редактировать учётную запись на сервере";
             case CheckAccount:
                 return "Проверка учётной записи";
             case CheckRegistrationOnServer:
diff --git a/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java b/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java
index 4aa37815..1c1165b0 100644
--- a/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java
+++ b/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.Server;
-import Common.Database.riDBObject;
+import Common.Database.DBObject;
 import Repository.RepositoryServer;
-public class DeleteServerObject<S extends RepositoryServer, D extends riDBObject> extends ServerObjectPass<S, D> {
+public class DeleteServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
     @Override
     public String getIconPath() {
         return "/icons/Delete.png";
diff --git a/src/Visual_DVM_2021/Passes/Server/EditServerObject.java b/src/Visual_DVM_2021/Passes/Server/EditServerObject.java
index 1d30e19e..456d79e2 100644
--- a/src/Visual_DVM_2021/Passes/Server/EditServerObject.java
+++ b/src/Visual_DVM_2021/Passes/Server/EditServerObject.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.Server;
-import Common.Database.riDBObject;
+import Common.Database.DBObject;
 import Repository.RepositoryServer;
-public class EditServerObject<S extends RepositoryServer, D extends riDBObject> extends ServerObjectPass<S, D> {
+public class EditServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
     //--
     @Override
     public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java b/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java
index 6dafb924..199c134d 100644
--- a/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java
+++ b/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java
@@ -1,12 +1,12 @@
 package Visual_DVM_2021.Passes.Server;
 import Common.Current;
+import Common.Database.DBObject;
 import Common.Database.Database;
-import Common.Database.riDBObject;
 import Common.Global;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.Common.TestingServer;
-public class PublishServerAccountObject<D extends riDBObject> extends PublishServerObject<TestingServer, D> {
+public class PublishServerAccountObject<D extends DBObject> extends PublishServerObject<TestingServer, D> {
     public PublishServerAccountObject(Class<D> d_in) {
         super(Global.testingServer, d_in);
     }
diff --git a/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java b/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java
index 5c0bb319..e4e0f081 100644
--- a/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java
+++ b/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java
@@ -1,9 +1,10 @@
 package Visual_DVM_2021.Passes.Server;
 import Common.Current;
+import Common.Database.DBObject;
 import Common.Database.riDBObject;
 import Repository.RepositoryServer;
-public class PublishServerObject<S extends RepositoryServer, D extends riDBObject> extends ServerObjectPass<S, D> {
-    protected Object pk = null;
+public class PublishServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
+    public Object pk = null;
     public PublishServerObject(S server_in, Class<D> d_in) {
         super(server_in, d_in);
     }
@@ -17,8 +18,11 @@ public class PublishServerObject<S extends RepositoryServer, D extends riDBObjec
         pk = null;
         if (Current.getAccount().CheckRegistered(Log)) {
             target = d.newInstance();
-            target.sender_name = Current.getAccount().name;
-            target.sender_address = Current.getAccount().email;
+            if (target instanceof riDBObject) {
+                riDBObject rTarget = (riDBObject) target;
+                rTarget.sender_name = Current.getAccount().name;
+                rTarget.sender_address = Current.getAccount().email;
+            }
             return fillObjectFields();
         }
         return false;
diff --git a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
index 6cd0e4ee..7fcfcaa9 100644
--- a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
+++ b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
@@ -9,8 +9,6 @@ public interface TestingWindow extends VisualizerForm {
     void ShowNoTestRunTask();
     //-
     void RefreshTabsNames();
-    void FocusTestingSystem();
-
     void RemountTestTable();
     //-
     void FocusTestingTasks();
diff --git a/src/Visual_DVM_2021/UI/Main/MainForm.java b/src/Visual_DVM_2021/UI/Main/MainForm.java
index 0ce72a62..e3e72f79 100644
--- a/src/Visual_DVM_2021/UI/Main/MainForm.java
+++ b/src/Visual_DVM_2021/UI/Main/MainForm.java
@@ -240,6 +240,10 @@ public class MainForm extends Form implements MainWindow {
         globalTabs.setSelectedIndex(1);
     }
     @Override
+    public void FocusTests() {
+        globalTabs.setSelectedIndex(3);
+    }
+    @Override
     public void FocusTesting() {
         globalTabs.setSelectedIndex(4);
     }
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index f5544b7a..b1e27f2e 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -140,10 +140,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         filterName = new StyledTextField();
     }
     @Override
-    public void FocusTestingSystem() {
-        testingTabs.setSelectedIndex(2);
-    }
-    @Override
     public void FocusTestingTasks() {
     }
     @Override