From c7a618dd259d9aa4469b689979c80b29d391a8b1 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 27 Mar 2025 12:55:56 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D0=BF=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B2=D0=BE=D0=B4=20=D1=85=D1=80=D0=B0=D0=BD=D0=B8=D0=BC?=
 =?UTF-8?q?=D1=8B=D1=85=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA?=
 =?UTF-8?q?=20=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2=20=D0=B8=D0=B7=20=D0=B4=D0=B6?=
 =?UTF-8?q?=D1=81=D0=BE=D0=BD=D0=B0=20=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=86=D1=83.=20=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BF=D1=83=D0=B1=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B0=D1=86=D0=B8=D0=B8,=20=D0=B1=D1=8B=D0=BB=20=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=88=D0=BD=D0=B8=D0=B9=20=D0=BF=D1=80=D0=BE=D1=85=D0=BE?=
 =?UTF-8?q?=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 18 ++---------
 .../Passes/All/PublishBugReport.java          | 32 +++++++------------
 src/_VisualDVM/Passes/All/SendBugReport.java  | 20 ------------
 src/_VisualDVM/Passes/PassCode.java           |  3 --
 4 files changed, 14 insertions(+), 59 deletions(-)
 delete mode 100644 src/_VisualDVM/Passes/All/SendBugReport.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 307dd243..8e48821c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,23 +7,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSetting.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSettingsDBTable.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/Database/Objects/nDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/nDBObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/Objects/rDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/rDBObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Properties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Properties.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/BugReportsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyBugReportSettings.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/ProjectData/SapforData/SapforProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.java" beforeDir="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/PublishBugReport.java b/src/_VisualDVM/Passes/All/PublishBugReport.java
index 0f182a3e..a8f02f4b 100644
--- a/src/_VisualDVM/Passes/All/PublishBugReport.java
+++ b/src/_VisualDVM/Passes/All/PublishBugReport.java
@@ -4,23 +4,24 @@ import Common.Utils.Utils_;
 import Common.Visual.UI;
 import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import _VisualDVM.ComponentsServer.BugReport.BugReportState;
+import _VisualDVM.ComponentsServer.ComponentsServer;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.Passes.Server.PublishServerObject;
 import _VisualDVM.Repository.EmailMessage;
 
 import java.io.File;
 import java.util.Date;
-public class PublishBugReport extends Pass<BugReport> {
+public class PublishBugReport extends PublishServerObject<ComponentsServer, BugReport> {
+    public PublishBugReport() {
+        super(Global.componentsServer, BugReport.class);
+    }
     @Override
     public String getIconPath() {
         return "/Common/icons/Publish.png";
     }
     @Override
-    public String getButtonText() {
-        return "";
-    }
-    @Override
-    protected boolean canStart(Object... args) {
+    protected boolean canStart(Object... args) throws Exception{
         if (Global.componentsServer.db.bugReports.getUI().CheckCurrent(Log)) {
             target = Global.componentsServer.db.bugReports.getUI().getCurrent();
             if (!target.state.equals(BugReportState.draft)) {
@@ -36,21 +37,17 @@ public class PublishBugReport extends Pass<BugReport> {
                     && (target.CheckDraft(Log))) {
                 return false;
             }
+            if (!target.project_version.isEmpty()) {
+                target.packed_archive = Utils_.fileToBytes(target.getArchiveFile());
+            }
+            target.change_date = new Date().getTime();
+            target.state = BugReportState.active;
             return true;
         }
         return false;
     }
     @Override
-    protected void body() throws Exception {
-        target.change_date = new Date().getTime();
-        Global.componentsServer.db.Update(target);
-        target.state = BugReportState.active;
-    }
-    @Override
     protected void performDone() throws Exception {
-        //2 - Отправка на сервер, с активным состоянием?
-        Global.mainModule.getPass(PassCode.SendBugReport).Do();
-        Global.componentsServer.db.Update(target);
         //3- рассылка
         EmailMessage message = new EmailMessage(
                 "Обнаружена ошибка " + Utils_.Brackets(target.id),
@@ -71,9 +68,4 @@ public class PublishBugReport extends Pass<BugReport> {
                 Global.componentsServer.db.recipients.getSelectedMails());
          */
     }
-    @Override
-    protected void showDone() throws Exception {
-        Global.componentsServer.db.bugReports.getUI().RedrawControl();
-        Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
-    }
 }
diff --git a/src/_VisualDVM/Passes/All/SendBugReport.java b/src/_VisualDVM/Passes/All/SendBugReport.java
deleted file mode 100644
index 0d294420..00000000
--- a/src/_VisualDVM/Passes/All/SendBugReport.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package _VisualDVM.Passes.All;
-import Common.Utils.Utils_;
-import _VisualDVM.ComponentsServer.BugReport.BugReport;
-import _VisualDVM.ComponentsServer.BugReport.BugReportState;
-import _VisualDVM.Global;
-import _VisualDVM.Passes.Server.ComponentsServerPass;
-import _VisualDVM.Repository.Server.ServerCode;
-public class SendBugReport extends ComponentsServerPass<BugReport> {
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        target = Global.componentsServer.db.bugReports.getUI().getCurrent();
-        if (!target.project_version.isEmpty())
-            target.packed_archive = Utils_.fileToBytes(target.getArchiveFile());
-        return SendRequest(ServerCode.PublishObject, "", target);
-    }
-    @Override
-    protected void performFail() throws Exception {
-        target.state = BugReportState.draft;
-    }
-}
diff --git a/src/_VisualDVM/Passes/PassCode.java b/src/_VisualDVM/Passes/PassCode.java
index f569a537..66171ab9 100644
--- a/src/_VisualDVM/Passes/PassCode.java
+++ b/src/_VisualDVM/Passes/PassCode.java
@@ -116,7 +116,6 @@ public enum PassCode implements PassCode_ {
     DeleteBugReport,
     DeleteBugReportFromServer,
     PublishBugReport,
-    SendBugReport,
     DeleteDownloadedBugReports,
     ExtractRecipients,
     Email,
@@ -781,8 +780,6 @@ public enum PassCode implements PassCode_ {
                 return "Удаление отчёта об ошибке с сервера";
             case PublishBugReport:
                 return "Публикация отчёта об ошибке";
-            case SendBugReport:
-                return "Отправка отчёта об ошибке на сервер";
             case ExtractRecipients:
                 return "Извлечение адресатов";
             case GetComponentsActualVersions: