diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0fd8dd88..701342a6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,9 +9,16 @@
-
-
+
+
+
+
+
+
+
+
+
diff --git a/properties b/properties
index 591afa8c..0e4aee55 100644
--- a/properties
+++ b/properties
@@ -1,6 +1,6 @@
{
"Workspace": "E:\\Tests",
- "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1733769275\\acrred41",
+ "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1738237411\\smodule114a",
"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/CheckRegistrationOnServer.java b/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java
index eafd6219..4030bce8 100644
--- a/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java
+++ b/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java
@@ -1,14 +1,18 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
+import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Repository.Subscribes.Subscriber;
-public class CheckRegistrationOnServer extends ComponentsRepositoryPass_OLD {
+public class CheckRegistrationOnServer extends ComponentsServerPass {
@Override
- protected void ServerAction() throws Exception {
- Command(new ServerExchangeUnit_2021(ServerCode.CheckSubscriberRole, "", Global.mainModule.getAccount()));
- target = (Subscriber) server_response.object;
+ protected boolean canStart(Object... args) throws Exception {
+ return SendRequest(ServerCode.CheckSubscriberRole, "", Global.mainModule.getAccount());
+ }
+ @Override
+ protected void body() throws Exception {
+ target = (Subscriber) request.server_response.object;
Global.mainModule.getAccount().role = target.role;
}
}
diff --git a/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java b/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
index 3f0f686c..1641c1e0 100644
--- a/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
+++ b/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
@@ -3,25 +3,16 @@ import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
+import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Repository.Server.ServerCode;
-import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import java.io.File;
-public class ConvertCorrectnessTests extends TestingSystemPass_OLD {
+public class ConvertCorrectnessTests extends TestingServerPass {
@Override
public String getIconPath() {
return "/icons/DownloadAll.png";
}
@Override
- public String getButtonText() {
- return "";
- }
- @Override
- protected int getTimeout() {
- return 0;
- }
- @Override
protected boolean canStart(Object... args) throws Exception {
if (!Global.mainModule.getAccount().isAdmin()) {
Log.Writeln_("Вы не являетесь администратором");
@@ -30,7 +21,10 @@ public class ConvertCorrectnessTests extends TestingSystemPass_OLD {
if (!Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) {
return false;
}
- return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.");
+ return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.")&&
+ SendRequest(ServerCode.RefreshDVMTests,
+ String.valueOf(
+ Global.testingServer.db.serverSapfors.getUI().getCurrent().id), Global.mainModule.getAccount(),0);
}
@Override
protected boolean needsAnimation() {
@@ -47,12 +41,6 @@ public class ConvertCorrectnessTests extends TestingSystemPass_OLD {
Global.mainModule.getUI().getTestingMenuBar().ShowAutoCheckTesting();
}
@Override
- protected void ServerAction() throws Exception {
- Command(new ServerExchangeUnit_2021(ServerCode.RefreshDVMTests,
- String.valueOf(
- Global.testingServer.db.serverSapfors.getUI().getCurrent().id), Global.mainModule.getAccount()));
- }
- @Override
protected void performFinish() throws Exception {
super.performFinish();
Global.mainModule.getPass(PassCode.SynchronizeTests).Do();
diff --git a/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java b/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java
index e4ee9e4e..4e6a6c6c 100644
--- a/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java
+++ b/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java
@@ -1,17 +1,16 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
+import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
-public class DeleteBugReportFromServer extends ComponentsRepositoryPass_OLD {
+import javafx.util.Pair;
+public class DeleteBugReportFromServer extends ComponentsServerPass {
@Override
protected boolean canStart(Object... args) {
target = (BugReport) args[0];
- return !target.state.equals(BugReportState.draft);
- }
- @Override
- protected void ServerAction() throws Exception {
- Command(new ServerExchangeUnit_2021(ServerCode.DeleteObject, "", target));
+ return !target.state.equals(BugReportState.draft)&&
+ SendRequest(ServerCode.DeleteObjectByPK, "",new Pair<>(BugReport.class, target.getPK()));
}
}
diff --git a/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java b/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java
index 0c91417f..46dc2f66 100644
--- a/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java
+++ b/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java
@@ -3,6 +3,7 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
+import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
@@ -10,29 +11,24 @@ import org.apache.commons.io.FileUtils;
import java.io.File;
import java.nio.file.Paths;
-public class DownloadAllBugReportsArchives extends ComponentsRepositoryPass_OLD {
+public class DownloadAllBugReportsArchives extends ComponentsServerPass {
@Override
public String getIconPath() {
return "/icons/DownloadAll.png";
}
@Override
- public String getButtonText() {
- return "";
- }
- @Override
protected void performPreparation() throws Exception {
Global.mainModule.getPass(PassCode.CloseCurrentProject).Do();
Global.mainModule.set(Current.Root, null); //чтобы гарантированно не существовало корня.
Utils.CleanDirectory(Global.BugReportsDirectory);
}
@Override
- protected int getTimeout() {
- return 60000;
+ protected boolean canStart(Object... args) throws Exception {
+ return SendRequest(ServerCode.ReceiveAllArchives, "", null, 60000);
}
@Override
- protected void ServerAction() throws Exception {
- Command(new ServerExchangeUnit_2021(ServerCode.ReceiveAllArchives));
- server_response.Unpack(target = Utils.getTempFileName("bugs"));
+ protected void body() throws Exception {
+ request.server_response.Unpack(target = Utils.getTempFileName("bugs"));
}
@Override
protected boolean validate() {
diff --git a/src/_VisualDVM/Passes/Server/CloneServerObject.java b/src/_VisualDVM/Passes/Server/CloneServerObject.java
index ce8e5fa3..e6d01c94 100644
--- a/src/_VisualDVM/Passes/Server/CloneServerObject.java
+++ b/src/_VisualDVM/Passes/Server/CloneServerObject.java
@@ -30,8 +30,10 @@ public abstract class CloneServerObject extends Pass
break;
}
}
- protected void SendFile(File src, String dst) throws Exception {
- Command(new ServerExchangeUnit_2021(ServerCode.SendFile, dst, Utils_.fileToBytes(src)));
- }
- protected void ReceiveFile(String src, File dst) throws Exception {
- Command(new ServerExchangeUnit_2021(ServerCode.ReceiveFile, src));
- if (server_response.object != null)
- server_response.Unpack(dst);
- }
- protected String ReadFile(String src) throws Exception {
- Command(new ServerExchangeUnit_2021(ServerCode.ReadFile, src));
- return server_response.object.toString();
- }
@Override
protected void body() throws Exception {
connect();
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index fd6702a8..df0842c5 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -130,6 +130,10 @@ public enum ServerCode {
return "Скачивание пакета тестирования DVM с сервера";
case ReceiveComponent:
return "Скачивание компонента с сервера";
+ case DeleteObjectByPK:
+ return "Удаление объекта с сервера";
+ case CheckSubscriberRole:
+ return "Проверка роли подписчика на сервере";
default:
return this.toString();
}