no message

This commit is contained in:
2025-02-04 16:55:55 +03:00
parent d35848478f
commit b0941d6bfd
6 changed files with 15 additions and 32 deletions

14
.idea/workspace.xml generated
View File

@@ -7,16 +7,10 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/TestingServerClientPass.java" 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/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.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/All/GetComponentsActualVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsActualVersions.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" />
<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" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@@ -3,19 +3,11 @@ import _VisualDVM.Constants;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
public class ShowSapforCompilationErr extends ShowTestingServerFile { public class ShowSapforCompilationErr extends ShowTestingServerFile {
@Override
protected int getTimeout() {
return super.getTimeout();
}
@Override @Override
public String getIconPath() { public String getIconPath() {
return "/icons/CompilationErrors.png"; return "/icons/CompilationErrors.png";
} }
@Override @Override
public String getButtonText() {
return "";
}
@Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
if (!Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) { if (!Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) {
return false; return false;

View File

@@ -3,19 +3,11 @@ import _VisualDVM.Constants;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
public class ShowSapforCompilationOut extends ShowTestingServerFile { public class ShowSapforCompilationOut extends ShowTestingServerFile {
@Override
protected int getTimeout() {
return super.getTimeout();
}
@Override @Override
public String getIconPath() { public String getIconPath() {
return "/icons/CompilationOutput.png"; return "/icons/CompilationOutput.png";
} }
@Override @Override
public String getButtonText() {
return "";
}
@Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
if (!Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) { if (!Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) {
return false; return false;

View File

@@ -1,6 +1,7 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import Common.Passes.PassException; import Common.Passes.PassException;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Passes.Server.TestingSystemPass_OLD; import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -11,21 +12,20 @@ import org.apache.commons.io.FileUtils;
import java.io.File; import java.io.File;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
public class ShowTestingServerFile extends TestingSystemPass_OLD<RemoteFile> { public class ShowTestingServerFile extends TestingServerPass<RemoteFile> {
String title; String title;
File localFile; File localFile;
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
title = (String) args[0]; title = (String) args[0];
target = (RemoteFile) args[1]; target = (RemoteFile) args[1];
return true; return SendRequest(ServerCode.ReceiveFile, target.full_name);
} }
@Override @Override
protected void ServerAction() throws Exception { protected void body() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.ReceiveFile, target.full_name));
localFile = Utils.getTempFileName(target.name); localFile = Utils.getTempFileName(target.name);
if (server_response.object != null) if (request.server_response != null)
server_response.Unpack(localFile); request.server_response.Unpack(localFile);
else throw new PassException("Файл не найден"); else throw new PassException("Файл не найден");
} }
@Override @Override

View File

@@ -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){ protected boolean SendRequest(ServerCode code_in,String arg_in, Serializable object_in){
return SendRequest(code_in,arg_in, object_in, Global.properties.SocketTimeout); 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){ protected boolean SendRequest(ServerCode code_in){
return SendRequest(code_in, "", null); return SendRequest(code_in, "", null);
} }

View File

@@ -105,6 +105,8 @@ public enum ServerCode {
return "Скачивание базы данных отчетов об ошибках с сервера"; return "Скачивание базы данных отчетов об ошибках с сервера";
case ReceiveTestsDatabase: case ReceiveTestsDatabase:
return "Скачивание базы тестирования с сервера"; return "Скачивание базы тестирования с сервера";
case ReceiveFile:
return "Скачивание файла с сервера";
default: default:
return this.toString(); return this.toString();
} }