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

Исправление клонирования пакетов ДВМ

Browse Source
This commit is contained in:
02090095
2024-03-22 23:08:51 +03:00
parent b6b6e2e642
commit 9f1777431c
13 changed files with 250 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/TestingSystem/Common/TestingServer.java
View File

@@ -16,6 +16,7 @@ import TestingSystem.Common.Test.Test;
import TestingSystem.Common.Test.TestType;
import TestingSystem.Common.TestingPackageToKill.TestingPackageToKill;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import TestingSystem.DVM.DVMPackage.DVMPackage_json;
import TestingSystem.DVM.DVMTestingPlanner;
import TestingSystem.SAPFOR.Json.SapforPackage_json;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
@@ -250,6 +251,10 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
Print("Получить информацию о задачах пакетов SAPFOR");
GetSapforPackagesJson();
break;
case GetDVMPackagesJson:
Print("Получить информацию о задачах пакетов DVM");
GetDVMPackagesJson();
break;
case GetFirstsActiveDVMPackages:
Print("Получить первые активные пакеты задач DVM на машинах");
GetFirstActiveDVMPackagesByMachines();
@@ -258,6 +263,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
}
}
//->>
Pair<Group, Vector<File>> ConvertDirectoryToGroup(File src, LanguageName languageName, TestType
testType, Account account) throws Exception {
@@ -617,6 +623,21 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
//-
Email(message, out, err);
}
private void GetDVMPackagesJson() throws Exception{
Vector<Integer> packages_ids = (Vector<Integer>) request.object;
Vector<DVMPackage_json> jsons = new Vector<>();
for (int package_id : packages_ids) {
if (!db.dvmPackages.containsKey(package_id))
throw new RepositoryRefuseException("Пакета задач DVM " + Utils.Brackets(package_id) + " не существует.");
DVMPackage dvmPackage = db.dvmPackages.get(package_id);
File json = dvmPackage.getJsonFile();
if (!json.exists())
throw new RepositoryRefuseException("Не найден JSON файл для пакета задач DVM " + Utils.Brackets(package_id));
jsons.add((DVMPackage_json) Utils.jsonFromFile(json, DVMPackage_json.class));
}
response = new ServerExchangeUnit_2021(ServerCode.OK);
response.object = jsons;
}
private void GetSapforPackagesJson() throws Exception {
Vector<Integer> packages_ids = (Vector<Integer>) request.object;
Vector<SapforPackage_json> jsons = new Vector<>();

17
src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
View File

@@ -3,11 +3,6 @@ import Common.Global;
import Common.UI.Menus_2023.DataMenuBar;
import Common.UI.Menus_2023.MenuBarButton;
import Common.Utils.Utils;
import TestingSystem.Common.Group.UI.AddGroupMenu;
import TestingSystem.Common.Group.UI.EditGroupMenu;
import TestingSystem.DVM.DVMPackage.UI.AddDVMPackageMenu;
import TestingSystem.DVM.DVMPackage.UI.EditDVMPackageMenu;
import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
@@ -16,8 +11,12 @@ public class DVMPackagesBar extends DataMenuBar {
super("пакеты задач DVM");
addPasses(PassCode_2021.SynchronizeTests);
addSeparator();
addMenus(new AddDVMPackageMenu());
addPasses(PassCode_2021.AddTasksToDVMPackage,PassCode_2021.DeleteDVMPackage);
//addMenus(new AddDVMPackageMenu());
addPasses(PassCode_2021.AddDVMPackage, PassCode_2021.AddTasksToDVMPackage);
addSeparator();
addPasses(PassCode_2021.CloneDVMPackage);
addSeparator();
addPasses(PassCode_2021.DeleteDVMPackage);
addSeparator();
addPasses(PassCode_2021.StartDVMPackage,
PassCode_2021.AbortDVMPackage);
@@ -31,13 +30,13 @@ public class DVMPackagesBar extends DataMenuBar {
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterMyOnly = ! DVMPackageDBTable.filterMyOnly;
DVMPackageDBTable.filterMyOnly = !DVMPackageDBTable.filterMyOnly;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils.getIcon( DVMPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
setIcon(Utils.getIcon(DVMPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
}
});
}

2
src/TestingSystem/DVM/DVMPackage/UI/AddDVMPackageMenu.java
View File

@@ -5,7 +5,9 @@ import Visual_DVM_2021.Passes.Pass_2021;
public class AddDVMPackageMenu extends VisualiserMenu {
public AddDVMPackageMenu() {
super("", "/icons/RedAdd.png");
/*
addPasses(PassCode_2021.AddDVMPackage,
PassCode_2021.CloneDVMPackage);
*/
}
}

2
src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java
View File

@@ -4,6 +4,6 @@ import Visual_DVM_2021.Passes.PassCode_2021;
public class AddSapforPackageMenu extends VisualiserMenu {
public AddSapforPackageMenu() {
super("", "/icons/RedAdd.png");
addPasses(PassCode_2021.AddSapforPackage,PassCode_2021.CloneSapforPackage);
// addPasses(PassCode_2021.AddSapforPackage,PassCode_2021.CloneSapforPackage);
}
}

7
src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
View File

@@ -12,8 +12,11 @@ public class SapforPackagesBar extends DataMenuBar {
super("пакеты задач SAPFOR");
addPasses(PassCode_2021.SynchronizeTests);
addSeparator();
addMenus(new AddSapforPackageMenu());
addPasses(PassCode_2021.AddTasksToSapforPackage, PassCode_2021.DeleteSapforPackage);
// addMenus(new AddSapforPackageMenu());
addPasses(PassCode_2021.AddSapforPackage, PassCode_2021.AddTasksToSapforPackage);
addSeparator();
addPasses(PassCode_2021.CloneSapforPackage);
addPasses(PassCode_2021.DeleteSapforPackage);
addSeparator();
addPasses(
PassCode_2021.StartSapforPackage,