From e43feb9ab5a37995f4df67ea414f2b6dbd554ec2 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 20 Nov 2023 22:29:38 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                                 |  5 ++---
 .../Passes/All/CreateGroupFromDirectory.java        |  6 +++++-
 .../Passes/All/CreateTestFromDirectory.java         |  1 -
 .../All/CreateTestsGroupFromSelectedVersions.java   |  4 ++++
 .../Passes/All/OpenCurrentProject.java              |  4 +---
 src/Visual_DVM_2021/Passes/All/PublishTest.java     | 13 ++++++++++++-
 .../Passes/All/PublishTestProject.java              |  1 +
 src/Visual_DVM_2021/Passes/PassCode_2021.java       |  2 ++
 8 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6c355e03..1cd6177b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,13 @@
   </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/CreateGroupFromDirectory.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/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.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/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.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/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" afterDir="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/PublishTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestProject.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
index 1baf30c3..88364036 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
@@ -31,7 +31,6 @@ public class CreateGroupFromDirectory extends Pass_2021<Group> {
         target = null;
         group_id = Constants.Nan;
         //-
-        Utils.RestoreSelectedDirectory(directoryChooser);
         dir = directoryChooser.ShowDialog();
         //-
         if (dir == null)
@@ -65,7 +64,12 @@ public class CreateGroupFromDirectory extends Pass_2021<Group> {
     @Override
     protected void body() throws Exception {
         for (File file : files) {
+            ShowMessage1("создание проекта: "+file.getName());
             passes.get(PassCode_2021.CreateTestFromDirectory).Do(file, group_id);
         }
     }
+    @Override
+    protected void performFinish() throws Exception {
+        passes.get(PassCode_2021.SynchronizeTests).Do();
+    }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
index 51affccc..0f37e52a 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
@@ -34,7 +34,6 @@ public class CreateTestFromDirectory extends Pass_2021<Test> {
         target = null;
         //-
         if (args.length == 0) {
-           Utils.RestoreSelectedDirectory(directoryChooser);
             if (!Current.Check(Log, Current.Group))
                 return false;
             group_id = Current.getGroup().id;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
index abd69e8e..d6343562 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
@@ -80,6 +80,10 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
         }
     }
     @Override
+    protected void performFinish() throws Exception {
+        passes.get(PassCode_2021.SynchronizeTests).Do();
+    }
+    @Override
     protected void FocusResult() {
         UI.getMainWindow().FocusTests();
     }
diff --git a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java b/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
index fedab902..71ea527d 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
+++ b/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
@@ -109,9 +109,7 @@ public class OpenCurrentProject extends Pass_2021<db_project_info> {
         Current.set(Current.Project, target);
         if (root_changes)
             Current.set(Current.Root, new_root);
-        Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(
-                SettingName.ProjectsSearchDirectory, dir.getParent()
-        );
+        Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir.getParent());
         Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(
                 SettingName.FREE_FORM, target.style.equals(LanguageStyle.free) ? "1" : "0")
         ;
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTest.java b/src/Visual_DVM_2021/Passes/All/PublishTest.java
index 2e1d9a6c..6ca45750 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishTest.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishTest.java
@@ -39,7 +39,7 @@ public class PublishTest extends PublishServerObject<TestingServer, Test> {
     }
     @Override
     protected void performPreparation() throws Exception {
-         target.description = Utils.ReplaceForbiddenSymbols(target.description);
+        target.description = Utils.ReplaceForbiddenSymbols(target.description);
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
@@ -70,4 +70,15 @@ public class PublishTest extends PublishServerObject<TestingServer, Test> {
         super.performDone();
         passes.get(PassCode_2021.PublishTestProject).Do(project, pk);
     }
+    @Override
+    protected void performFinish() throws Exception {
+        if (from_current_project)
+            super.performFinish();
+        else disconnect();
+    }
+    @Override
+    protected void showDone() throws Exception {
+        if (from_current_project)
+            super.showDone();
+    }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTestProject.java b/src/Visual_DVM_2021/Passes/All/PublishTestProject.java
index e6a17724..fbf8d655 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishTestProject.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishTestProject.java
@@ -40,6 +40,7 @@ public class PublishTestProject extends TestingSystemPass<db_project_info> {
     }
     @Override
     protected void ServerAction() throws Exception {
+        ShowMessage1(target.name);
         Command(new ServerExchangeUnit_2021(ServerCode.PublishTestProject, String.valueOf(test_id), bytes));
     }
     @Override
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 392e0dc9..de0479bc 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -305,6 +305,8 @@ public enum PassCode_2021 {
         switch (this) {
             case Undefined:
                 return "?";
+            case CreateGroupFromDirectory:
+                return "Создать группу тестов из папки";
             case CreateTestFromDirectory:
                 return "Создать тест из папки";
             case AbortTaskPackage: