From 13cda78d475b7a438f8c0319a85666b1d86dc05c Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 4 Feb 2025 22:00:16 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                              |  5 +++--
 properties                                       |  2 +-
 src/_VisualDVM/Passes/All/DownloadBugReport.java | 10 +++++-----
 src/_VisualDVM/Passes/All/DownloadComponent.java | 12 ++++++++----
 src/_VisualDVM/Repository/Server/ServerCode.java |  2 ++
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bca3abe3..0fd8dd88 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,9 @@
   <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/DownloadDVMPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackages.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadComponent.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/properties b/properties
index fff10d8d..591afa8c 100644
--- a/properties
+++ b/properties
@@ -1,6 +1,6 @@
 {
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
+  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1733769275\\acrred41",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
diff --git a/src/_VisualDVM/Passes/All/DownloadBugReport.java b/src/_VisualDVM/Passes/All/DownloadBugReport.java
index 4d5eaf3f..e1f94c24 100644
--- a/src/_VisualDVM/Passes/All/DownloadBugReport.java
+++ b/src/_VisualDVM/Passes/All/DownloadBugReport.java
@@ -2,23 +2,23 @@ package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
+import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.BugReport.BugReport;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
-public class DownloadBugReport extends ComponentsRepositoryPass_OLD<BugReport> {
+public class DownloadBugReport extends ComponentsServerPass<BugReport> {
     @Override
     protected boolean canStart(Object... args) {
         target = (BugReport) args[0];
-        return !target.getArchiveFile().exists();
+        return !target.getArchiveFile().exists()&&SendRequest(ServerCode.ReceiveBugReport, target.id);
     }
     @Override
     protected void performPreparation() throws Exception {
         Utils_.CheckDirectory(Global.BugReportsDirectory);
     }
     @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.ReceiveBugReport, target.id));
-        Utils_.bytesToFile((byte[]) server_response.object, target.getArchiveFile());
+    protected void body() throws Exception {
+        Utils_.bytesToFile((byte[]) request.server_response.object, target.getArchiveFile());
     }
     @Override
     protected boolean validate() {
diff --git a/src/_VisualDVM/Passes/All/DownloadComponent.java b/src/_VisualDVM/Passes/All/DownloadComponent.java
index 556bc0f0..8ce8d1f2 100644
--- a/src/_VisualDVM/Passes/All/DownloadComponent.java
+++ b/src/_VisualDVM/Passes/All/DownloadComponent.java
@@ -2,15 +2,19 @@ package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
+import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.Component.Component;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
-public class DownloadComponent extends ComponentsRepositoryPass_OLD<Component> {
+public class DownloadComponent extends ComponentsServerPass<Component> {
     @Override
-    protected void ServerAction() throws Exception {
+    protected boolean canStart(Object... args) throws Exception {
         target = Global.components.getUI().getCurrent();
         String packed = target.getComponentType() + "\n" + target.getFileName();
-        Command(new ServerExchangeUnit_2021(ServerCode.ReceiveComponent, packed));
-        Utils_.bytesToFile((byte[]) server_response.object, target.getNewFile());
+        return SendRequest(ServerCode.ReceiveComponent, packed);
+    }
+    @Override
+    protected void body() throws Exception {
+        Utils_.bytesToFile((byte[]) request.server_response.object, target.getNewFile());
     }
 }
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index ddfa2391..fd6702a8 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -128,6 +128,8 @@ public enum ServerCode {
                 return "Скачивание пакета тестирования SAPFOR с сервера";
             case DownloadDVMPackages:
                 return "Скачивание пакета тестирования DVM с сервера";
+            case ReceiveComponent:
+                return "Скачивание компонента с сервера";
             default:
                 return this.toString();
         }