From 18414e5c80427fb16867741b471ad7a57eef9358 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 26 Nov 2024 14:45:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=B0=20=D1=81=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B5=D0=B9.=20v++=20todo=20=D1=80=D0=B5=D1=84=D0=B0=D0=BA?=
 =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=20=D1=81=D0=B8=D1=81=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BC=D1=8B=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=B8=20=D0=BF=D1=80=D0=BE=D1=87=D0=B5=D0=B3=D0=BE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  8 +++
 .../Passes/All/AppendBugReportField.java      |  2 +-
 src/_VisualDVM/Passes/All/CheckedEmail.java   | 53 +++++++++++++++++++
 src/_VisualDVM/Passes/All/Email.java          | 35 +-----------
 .../Passes/All/PublishBugReport.java          |  2 +-
 .../Passes/All/PublishComponent.java          |  2 +-
 .../Passes/All/UpdateBugReportField.java      |  2 +-
 src/_VisualDVM/Passes/PassCode.java           |  5 +-
 .../Repository/Component/Visualiser.java      |  2 +-
 9 files changed, 71 insertions(+), 40 deletions(-)
 create mode 100644 src/_VisualDVM/Passes/All/CheckedEmail.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fb1d2cbc..f2f473ee 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckedEmail.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/_VisualDVM/Passes/All/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" 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/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Passes/All/AppendBugReportField.java b/src/_VisualDVM/Passes/All/AppendBugReportField.java
index 073c8292..babba494 100644
--- a/src/_VisualDVM/Passes/All/AppendBugReportField.java
+++ b/src/_VisualDVM/Passes/All/AppendBugReportField.java
@@ -80,7 +80,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
                 message_text = target.comment;
                 break;
         }
-        Global.mainModule.getPass(PassCode.Email).Do(
+        Global.mainModule.getPass(PassCode.CheckedEmail).Do(
                 new EmailMessage(
                         message_header + " " + Utils_.Brackets(Global.mainModule.getAccount().name),
                         message_text,
diff --git a/src/_VisualDVM/Passes/All/CheckedEmail.java b/src/_VisualDVM/Passes/All/CheckedEmail.java
new file mode 100644
index 00000000..1548615f
--- /dev/null
+++ b/src/_VisualDVM/Passes/All/CheckedEmail.java
@@ -0,0 +1,53 @@
+package _VisualDVM.Passes.All;
+import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
+import _VisualDVM.Repository.EmailMessage;
+import _VisualDVM.Repository.Server.ServerCode;
+import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
+import _VisualDVM.Repository.Subscribes.Subscriber;
+import _VisualDVM.Utils;
+
+import java.util.Vector;
+//http://java-online.ru/javax-mail.xhtml
+//https://javarush.ru/groups/posts/1226-kak-otpravitjh-pisjhmo-iz-java-prilozhenija-s-primerom
+public class CheckedEmail extends ComponentsRepositoryPass<EmailMessage> {
+    //этот емейл только для клиента. все что он делает отправляет на сервер то. что нужно отправить.
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        target = (EmailMessage) args[0];
+        return true;
+    }
+    @Override
+    protected int getTimeout() {
+        return 0;
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        Vector<String> targetsNames = new Vector<>();
+        for (String target : target.targets) {
+            if (server.db.subscribers.containsKey(target)) {
+                Subscriber subscriber = server.db.subscribers.get(target);
+                if (subscriber.mailOn != 0) {
+                    String[] data = target.split("@");
+                    if (data.length > 0) {
+                        String tname = data[0];
+                        targetsNames.add(tname);
+                    }
+                }
+            }
+        }
+        Utils.addDefaultMails(target.targets);
+        String text_ =
+                "Адресаты: " + String.join(", ", targetsNames) + "\n" +
+                        target.text;
+        //нужно разделить сообщение на несколько одинаковых, по числу адресатов.
+        for (String recipient : target.targets) {
+            System.out.println(recipient);
+            EmailMessage part = new EmailMessage();
+            part.subject = target.subject;
+            part.text = text_;
+            part.targets.add(recipient);
+            part.files.putAll(target.files);
+            Command(new ServerExchangeUnit_2021(ServerCode.Email, "", part));
+        }
+    }
+}
diff --git a/src/_VisualDVM/Passes/All/Email.java b/src/_VisualDVM/Passes/All/Email.java
index 27c7136c..823891b1 100644
--- a/src/_VisualDVM/Passes/All/Email.java
+++ b/src/_VisualDVM/Passes/All/Email.java
@@ -1,15 +1,8 @@
 package _VisualDVM.Passes.All;
-import Common.Utils.Utils_;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
-import _VisualDVM.Repository.Subscribes.Subscriber;
-import _VisualDVM.Utils;
-
-import java.util.Vector;
-//http://java-online.ru/javax-mail.xhtml
-//https://javarush.ru/groups/posts/1226-kak-otpravitjh-pisjhmo-iz-java-prilozhenija-s-primerom
 public class Email extends ComponentsRepositoryPass<EmailMessage> {
     //этот емейл только для клиента. все что он делает отправляет на сервер то. что нужно отправить.
     @Override
@@ -23,32 +16,6 @@ public class Email extends ComponentsRepositoryPass<EmailMessage> {
     }
     @Override
     protected void ServerAction() throws Exception {
-        Vector<String> targetsNames = new Vector<>();
-        for (String target : target.targets) {
-            if (server.db.subscribers.containsKey(target)) {
-                Subscriber subscriber = server.db.subscribers.get(target);
-                if (subscriber.mailOn != 0) {
-                    String[] data = target.split("@");
-                    if (data.length > 0) {
-                        String tname = data[0];
-                        targetsNames.add(tname);
-                    }
-                }
-            }
-        }
-        Utils.addDefaultMails(target.targets);
-        String text_ =
-                "Адресаты: " + String.join(", ", targetsNames) + "\n" +
-                        target.text;
-        //нужно разделить сообщение на несколько одинаковых, по числу адресатов.
-        for (String recipient : target.targets) {
-            System.out.println(recipient);
-            EmailMessage part = new EmailMessage();
-            part.subject = target.subject;
-            part.text = text_;
-            part.targets.add(recipient);
-            part.files.putAll(target.files);
-            Command(new ServerExchangeUnit_2021(ServerCode.Email, "", part));
-        }
+        Command(new ServerExchangeUnit_2021(ServerCode.Email, "", target));
     }
 }
diff --git a/src/_VisualDVM/Passes/All/PublishBugReport.java b/src/_VisualDVM/Passes/All/PublishBugReport.java
index 05e66368..d1bd5f47 100644
--- a/src/_VisualDVM/Passes/All/PublishBugReport.java
+++ b/src/_VisualDVM/Passes/All/PublishBugReport.java
@@ -64,7 +64,7 @@ public class PublishBugReport extends Pass<BugReport> {
                     message.addAttachement(screen);
             }
         }
-        Global.mainModule.getPass(PassCode.Email).Do(message);
+        Global.mainModule.getPass(PassCode.CheckedEmail).Do(message);
     }
     @Override
     protected void showDone() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/PublishComponent.java b/src/_VisualDVM/Passes/All/PublishComponent.java
index 4e917346..33136e9d 100644
--- a/src/_VisualDVM/Passes/All/PublishComponent.java
+++ b/src/_VisualDVM/Passes/All/PublishComponent.java
@@ -108,7 +108,7 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
                             new Vector<>(Global.componentsServer.db.subscribers.Data.keySet()));
             if (f.fields.cbForceMail.isSelected())
                 message.addAttachement(target.getFile());
-            Global.mainModule.getPass(PassCode.Email).Do(message);
+            Global.mainModule.getPass(PassCode.CheckedEmail).Do(message);
             //---
             if (target.getComponentType().equals(ComponentType.Sapfor_F) && f.fields.cbAssemblyOnServer.isSelected()) {
                 Global.mainModule.getUI().getMainWindow().FocusTesting();
diff --git a/src/_VisualDVM/Passes/All/UpdateBugReportField.java b/src/_VisualDVM/Passes/All/UpdateBugReportField.java
index 32eae60b..6a412911 100644
--- a/src/_VisualDVM/Passes/All/UpdateBugReportField.java
+++ b/src/_VisualDVM/Passes/All/UpdateBugReportField.java
@@ -121,7 +121,7 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
                     message_header += "состояние изменилось на " + Utils_.Brackets(target.state.getDescription());
                     break;
             }
-            Global.mainModule.getPass(PassCode.Email).Do(
+            Global.mainModule.getPass(PassCode.CheckedEmail).Do(
                     new EmailMessage(message_header,
                             message_text,
                             target.getRecipients())
diff --git a/src/_VisualDVM/Passes/PassCode.java b/src/_VisualDVM/Passes/PassCode.java
index 16b7eda6..d6c27996 100644
--- a/src/_VisualDVM/Passes/PassCode.java
+++ b/src/_VisualDVM/Passes/PassCode.java
@@ -124,6 +124,7 @@ public enum PassCode implements PassCode_ {
     SendBugReport,
     DeleteDownloadedBugReports,
     ExtractRecipients,
+    CheckedEmail,
     Email,
     //-
     GetComponentsActualVersions,
@@ -356,6 +357,8 @@ public enum PassCode implements PassCode_ {
     @Override
     public String getDescription() {
         switch (this) {
+            case Email:
+                return "Отправка по email";
             case SPF_RemoveDistArraysFromIO:
                 return "Устранение конфликтов ввода вывода";
             case StartSelectedSAPFORConfigurations:
@@ -745,7 +748,7 @@ public enum PassCode implements PassCode_ {
                 return "Отправка отчёта об ошибке на сервер";
             case ExtractRecipients:
                 return "Извлечение адресатов";
-            case Email:
+            case CheckedEmail:
                 return "Отправка по email";
             case GetComponentsActualVersions:
                 return "Получение актуальных версий компонент";
diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java
index cd337ccd..1587cd3c 100644
--- a/src/_VisualDVM/Repository/Component/Visualiser.java
+++ b/src/_VisualDVM/Repository/Component/Visualiser.java
@@ -61,7 +61,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1121;
+        version = 1122;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());