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

---
 .idea/workspace.xml                               |  6 ++++--
 .../Passes/All/CreateGroupFromDirectory.java      |  2 +-
 .../Passes/All/CreateGroupFromFiles.java          |  3 ++-
 .../Passes/All/CreateTestsFromFiles.java          |  2 +-
 .../All/CreateTestsGroupFromSelectedVersions.java |  4 +++-
 src/_VisualDVM/Passes/All/PublishTests.java       | 15 ++++-----------
 src/_VisualDVM/Repository/Server/ServerCode.java  |  2 ++
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 76594e66..198deaca 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,10 @@
   <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/_VisualDVM/Passes/All/Email.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Email.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishTests.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java b/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java
index 42f52974..91f6b625 100644
--- a/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java
+++ b/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java
@@ -61,7 +61,7 @@ public class CreateGroupFromDirectory extends PublishTests {
         } else return false;
         //---------------
         Vector<File> files = new Vector<>(Arrays.asList(files_));
-        Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", directoryChooser.getCurrentDirectory());
+        Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", directoryChooser.getCurrentDirectory().getAbsolutePath());
         return super.canStart(files, group);
     }
 }
diff --git a/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java b/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java
index d7f93244..ab6318b7 100644
--- a/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java
+++ b/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java
@@ -1,5 +1,6 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
+import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.VFileChooser;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
@@ -29,7 +30,7 @@ public class CreateGroupFromFiles extends PublishTests {
             return false;
         }
         File dir = fileChooser.getCurrentDirectory();
-        Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", dir);
+        Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", dir.getAbsolutePath());
         //---------------
         if (dir.getName().equals(Constants.data)) {
             Log.Writeln_(Utils_.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
diff --git a/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java b/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java
index 46a801ea..db1648ee 100644
--- a/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java
+++ b/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java
@@ -25,7 +25,7 @@ public class CreateTestsFromFiles extends PublishTests {
                 Log.Writeln_("Не выбрано ни одного файла.");
                 return false;
             }
-            Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", fileChooser.getCurrentDirectory());
+            Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", fileChooser.getCurrentDirectory().getAbsolutePath());
             return super.canStart(files, Global.testingServer.db.groups.getUI().getCurrent());
         }
         return false;
diff --git a/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java
index b7cdab25..0229d842 100644
--- a/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java
+++ b/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java
@@ -5,6 +5,7 @@ import Common.Visual.UI;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Project.db_project_info;
+import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 
 import java.util.Vector;
@@ -46,6 +47,7 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests {
         }
         //---
         return UI.Question("В группу " + Utils_.Brackets(group.description) +
-                "\nбудет добавлено " + target.size() + " тестов.\nПродолжить");
+                "\nбудет добавлено " + target.size() + " тестов.\nПродолжить")&&
+                SendRequest(ServerCode.PublishObjects, null, target);
     }
 }
diff --git a/src/_VisualDVM/Passes/All/PublishTests.java b/src/_VisualDVM/Passes/All/PublishTests.java
index e4e466cb..25aa48c3 100644
--- a/src/_VisualDVM/Passes/All/PublishTests.java
+++ b/src/_VisualDVM/Passes/All/PublishTests.java
@@ -4,6 +4,7 @@ import Common.Utils.Utils_;
 import Common.Visual.UI;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.Passes.Server.TestingServerPass;
 import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -12,7 +13,7 @@ import _VisualDVM.TestingSystem.Common.Test.Test;
 
 import java.io.File;
 import java.util.Vector;
-public abstract class PublishTests extends TestingSystemPass_OLD<Vector<Test>> {
+public abstract class PublishTests extends TestingServerPass<Vector<Test>> {
     protected Group group;
     //----
     @Override
@@ -24,14 +25,6 @@ public abstract class PublishTests extends TestingSystemPass_OLD<Vector<Test>> {
         return "/icons/AddFile.png";
     }
     @Override
-    protected boolean needsAnimation() {
-        return true;
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.PublishObjects, null, target));
-    }
-    @Override
     protected void performFinish() throws Exception {
         super.performFinish();
         Global.mainModule.getPass(PassCode.SynchronizeTests).Do();
@@ -45,7 +38,6 @@ public abstract class PublishTests extends TestingSystemPass_OLD<Vector<Test>> {
     protected String getNoFilesMessage() {
         return "";
     }
-    ;
     //--
     @Override
     protected boolean canStart(Object... args) throws Exception {
@@ -71,6 +63,7 @@ public abstract class PublishTests extends TestingSystemPass_OLD<Vector<Test>> {
         }
         //---
         return UI.Question("В группу " + Utils_.Brackets(group.description) +
-                "\nбудет добавлено " + target.size() + " тестов.\nПродолжить");
+                "\nбудет добавлено " + target.size() + " тестов.\nПродолжить") &&
+                SendRequest(ServerCode.PublishObjects, null, target);
     }
 }
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index b0dffeae..cbb9d347 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -114,6 +114,8 @@ public enum ServerCode {
                 return "Проверка регистрации машины на сервере";
             case EmailBroadcast:
                 return "Рассылка";
+            case PublishObjects:
+                return "Публикация объектов";
             default:
                 return this.toString();
         }