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

---
 .idea/workspace.xml                                | 14 ++++----------
 .../Passes/All/ShowSapforCompilationErr.java       |  8 --------
 .../Passes/All/ShowSapforCompilationOut.java       |  8 --------
 .../Passes/All/ShowTestingServerFile.java          | 12 ++++++------
 src/_VisualDVM/Passes/Server/ClientPass.java       |  3 +++
 src/_VisualDVM/Repository/Server/ServerCode.java   |  2 ++
 6 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2641ccaa..2a2235ee 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,16 +7,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ComponentsServerClientPass.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/TestingServerClientPass.java" 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/GetComponentsActualVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsActualVersions.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/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeBugReports.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowTestingServerFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowTestingServerFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java b/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java
index d8d7235b..57126679 100644
--- a/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java
+++ b/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java
@@ -3,19 +3,11 @@ import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 public class ShowSapforCompilationErr extends ShowTestingServerFile {
-    @Override
-    protected int getTimeout() {
-        return super.getTimeout();
-    }
     @Override
     public String getIconPath() {
         return "/icons/CompilationErrors.png";
     }
     @Override
-    public String getButtonText() {
-        return "";
-    }
-    @Override
     protected boolean canStart(Object... args) throws Exception {
         if (!Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) {
             return false;
diff --git a/src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java b/src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java
index d81cb0f6..2b266d89 100644
--- a/src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java
+++ b/src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java
@@ -3,19 +3,11 @@ import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 public class ShowSapforCompilationOut extends ShowTestingServerFile {
-    @Override
-    protected int getTimeout() {
-        return super.getTimeout();
-    }
     @Override
     public String getIconPath() {
         return "/icons/CompilationOutput.png";
     }
     @Override
-    public String getButtonText() {
-        return "";
-    }
-    @Override
     protected boolean canStart(Object... args) throws Exception {
         if (!Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) {
             return false;
diff --git a/src/_VisualDVM/Passes/All/ShowTestingServerFile.java b/src/_VisualDVM/Passes/All/ShowTestingServerFile.java
index a9c0aa9d..34243b26 100644
--- a/src/_VisualDVM/Passes/All/ShowTestingServerFile.java
+++ b/src/_VisualDVM/Passes/All/ShowTestingServerFile.java
@@ -1,6 +1,7 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.PassException;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
+import _VisualDVM.Passes.Server.TestingServerPass;
 import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -11,21 +12,20 @@ import org.apache.commons.io.FileUtils;
 import java.io.File;
 import java.util.List;
 import java.util.Vector;
-public class ShowTestingServerFile extends TestingSystemPass_OLD<RemoteFile> {
+public class ShowTestingServerFile extends TestingServerPass<RemoteFile> {
     String title;
     File localFile;
     @Override
     protected boolean canStart(Object... args) throws Exception {
         title = (String) args[0];
         target = (RemoteFile) args[1];
-        return true;
+        return SendRequest(ServerCode.ReceiveFile, target.full_name);
     }
     @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.ReceiveFile, target.full_name));
+    protected void body() throws Exception {
         localFile = Utils.getTempFileName(target.name);
-        if (server_response.object != null)
-            server_response.Unpack(localFile);
+        if (request.server_response != null)
+            request.server_response.Unpack(localFile);
         else throw new PassException("Файл не найден");
     }
     @Override
diff --git a/src/_VisualDVM/Passes/Server/ClientPass.java b/src/_VisualDVM/Passes/Server/ClientPass.java
index 54a2a1e5..6281fc0e 100644
--- a/src/_VisualDVM/Passes/Server/ClientPass.java
+++ b/src/_VisualDVM/Passes/Server/ClientPass.java
@@ -43,6 +43,9 @@ public abstract class ClientPass <S extends RepositoryServer,T> extends Pass<T>
     protected boolean SendRequest(ServerCode code_in,String arg_in, Serializable object_in){
         return SendRequest(code_in,arg_in, object_in, Global.properties.SocketTimeout);
     }
+    protected boolean SendRequest(ServerCode code_in, String arg_in){
+        return SendRequest(code_in,arg_in,null);
+    }
     protected boolean SendRequest(ServerCode code_in){
         return SendRequest(code_in, "", null);
     }
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index cafc5521..12e19823 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -105,6 +105,8 @@ public enum ServerCode {
                 return "Скачивание базы данных отчетов об ошибках с сервера";
             case ReceiveTestsDatabase:
                 return "Скачивание базы тестирования с сервера";
+            case ReceiveFile:
+                return "Скачивание файла с сервера";
             default:
                 return this.toString();
         }