M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

рефакторинг отправления бага. была избыточная команда

Browse Source
This commit is contained in:
02090095
2025-02-03 23:50:09 +03:00
parent 26434b21ab
commit 505d151ee5
7 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
View File

@@ -6,17 +6,19 @@ import Common.Visual.Windows.Dialog.VFileChooser;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ClientPass;
import _VisualDVM.Passes.Server.TestingSystemPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.Utils;
import java.io.File;
import java.util.LinkedHashMap;
import java.util.Vector;
public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
public class ReplaceTestsFromFiles extends ClientPass<TestingServer,Vector<Test>> {
VFileChooser fileChooser = new VFileChooser("Выберите файлы для замены тестов");
//--
Group group;
@@ -28,6 +30,10 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
public String getIconPath() {
return "/icons/Menu/Undo.png";
}
@Override
protected TestingServer getServer() {
return Global.testingServer;
}
//-
@Override
protected boolean canStart(Object... args) throws Exception {
@@ -72,7 +78,7 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
//--
for (String name : filesByNames.keySet()) {
boolean exists = false;
for (Test test : server.db.tests.Data.values()) {
for (Test test : getServer().db.tests.Data.values()) {
if ((test.group_id == group.id) && test.description.equals(name)) {
exists = true;
//--
@@ -114,20 +120,16 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
newTests.add(new_test);
}
}
if (!replaceTests.isEmpty())
SendRequest(ServerCode.ReplaceTestsCodes, null, replaceTests);
if (!newTests.isEmpty())
SendRequest(ServerCode.PublishObjects, null, newTests);
return true;
}
;
return false;
}
//-
@Override
protected void ServerAction() throws Exception {
if (!replaceTests.isEmpty())
Command(new ServerExchangeUnit_2021(ServerCode.ReplaceTestsCodes, null, replaceTests));
if (!newTests.isEmpty())
Command(new ServerExchangeUnit_2021(ServerCode.PublishObjects, null, newTests));
}
@Override
protected void performFinish() throws Exception {
super.performFinish();
Global.mainModule.getPass(PassCode.SynchronizeTests).Do();

24
src/_VisualDVM/Passes/All/SendBugReport.java
View File

@@ -1,27 +1,25 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.Server.ClientPass;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
public class SendBugReport extends ComponentsRepositoryPass<BugReport> {
public class SendBugReport extends ClientPass<ComponentsServer,BugReport> {
@Override
protected void ServerAction() throws Exception {
protected boolean canStart(Object... args) throws Exception {
target = Global.componentsServer.db.bugReports.getUI().getCurrent();
if (!target.project_version.isEmpty()) {
//отправить архив.
Command(new ServerExchangeUnit_2021(ServerCode.SendBugReport,
target.id,
Utils_.fileToBytes(target.getArchiveFile())
));
}
// синхрон бд
Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", target));
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;
}
@Override
protected ComponentsServer getServer() {
return Global.componentsServer;
}
}