From e1fc74032141fab952dfa3a3dad5b08d06a398ee Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 4 Feb 2025 19:28:38 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                              |  5 +++--
 src/_VisualDVM/Passes/All/Email.java             | 16 ++++------------
 src/_VisualDVM/Repository/RepositoryServer.java  | 12 ++++++++++++
 src/_VisualDVM/Repository/Server/ServerCode.java |  3 +++
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f9b74525..76594e66 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.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/_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$/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/Email.java b/src/_VisualDVM/Passes/All/Email.java
index f54a343b..3da3f1bc 100644
--- a/src/_VisualDVM/Passes/All/Email.java
+++ b/src/_VisualDVM/Passes/All/Email.java
@@ -1,11 +1,12 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
+import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 
 import java.util.Vector;
-public class Email extends ComponentsRepositoryPass_OLD<EmailMessage> {
+public class Email extends ComponentsServerPass<EmailMessage> {
     Vector<String> recipients;
     @Override
     protected boolean canStart(Object... args) throws Exception {
@@ -28,17 +29,8 @@ public class Email extends ComponentsRepositoryPass_OLD<EmailMessage> {
         return false;
     }
     @Override
-    protected int getTimeout() {
-        return 0;
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        int i = 0;
-        for (String address : recipients) {
-            ShowProgress(recipients.size(), i, true);
-            Command(new ServerExchangeUnit_2021(ServerCode.Email, address, target));
-            ++i;
-        }
+    protected void body() throws Exception {
+        SendRequest(ServerCode.EmailBroadcast, String.join("\n",recipients), target);
     }
 }
 
diff --git a/src/_VisualDVM/Repository/RepositoryServer.java b/src/_VisualDVM/Repository/RepositoryServer.java
index 9066f95e..845a319e 100644
--- a/src/_VisualDVM/Repository/RepositoryServer.java
+++ b/src/_VisualDVM/Repository/RepositoryServer.java
@@ -224,6 +224,9 @@ public abstract class RepositoryServer<D extends Database> {
                                     Email((EmailMessage) request.object, request.arg);
                                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                                     break;
+                                case EmailBroadcast:
+                                    EmailBroadcast();
+                                    break;
                                 //</editor-fold>
                                 //<editor-fold desc="Главная база данных">
                                 case CheckObjectExistense:
@@ -321,6 +324,15 @@ public abstract class RepositoryServer<D extends Database> {
             }
         }
     }
+    private void EmailBroadcast() throws Exception{
+        String [] packed = request.arg.split("\n");
+        for (String address: packed){
+            if (!address.isEmpty()){
+                Email((EmailMessage) request.object, address);
+            }
+        }
+        response = new ServerExchangeUnit_2021(ServerCode.OK);
+    }
     //--
     protected Database getDefaultDatabase() {
         return db;
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index d898367e..b0dffeae 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -15,6 +15,7 @@ public enum ServerCode {
     AppendBugReportTextField,
     //-
     Email,
+    EmailBroadcast,
     ReceiveAllArchives,
     //-
     DownloadTest,
@@ -111,6 +112,8 @@ public enum ServerCode {
                 return "Получение журнала изменений компонента с сервера";
             case CheckURLRegistered:
                 return "Проверка регистрации машины на сервере";
+            case EmailBroadcast:
+                return "Рассылка";
             default:
                 return this.toString();
         }