fix удаления пакетов если среди них есть черновик
This commit is contained in:
9
.idea/workspace.xml
generated
9
.idea/workspace.xml
generated
@@ -7,10 +7,13 @@
|
|||||||
</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/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" afterDir="false" />
|
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.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" />
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
"PerformanceAnalyzerPath": "",
|
"PerformanceAnalyzerPath": "",
|
||||||
"ComponentsBackUpsCount": 10,
|
"ComponentsBackUpsCount": 10,
|
||||||
"TestingKernels": 28,
|
"TestingKernels": 28,
|
||||||
"AutoCheckTesting": false,
|
"AutoCheckTesting": true,
|
||||||
"CheckTestingIntervalSeconds": 10,
|
"CheckTestingIntervalSeconds": 10,
|
||||||
"EmailOnTestingProgress": false
|
"EmailOnTestingProgress": false
|
||||||
}
|
}
|
||||||
@@ -4,6 +4,7 @@ import Visual_DVM_2021.Passes.PassCode_2021;
|
|||||||
public class SapforPackagesBar extends DataMenuBar {
|
public class SapforPackagesBar extends DataMenuBar {
|
||||||
public SapforPackagesBar() {
|
public SapforPackagesBar() {
|
||||||
super("пакеты задач SAPFOR"
|
super("пакеты задач SAPFOR"
|
||||||
|
//, PassCode_2021.AddSapforPackage
|
||||||
// PassCode_2021.AbortSapforTaskPackage,
|
// PassCode_2021.AbortSapforTaskPackage,
|
||||||
// PassCode_2021.DeleteSapforTasksPackage
|
// PassCode_2021.DeleteSapforTasksPackage
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ public class AddDVMPackage extends AddObjectPass<DVMPackage> {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void body() throws Exception {
|
protected void body() throws Exception {
|
||||||
//черновик не вставляется в бд.
|
//черновик не вставляется в бд. идет только как элемент списка.
|
||||||
Global.testingServer.db.dvmPackages.Data.put(target.id, target);
|
Global.testingServer.db.dvmPackages.Data.put(target.id, target);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
4
src/Visual_DVM_2021/Passes/All/AddSapforPackage.java
Normal file
4
src/Visual_DVM_2021/Passes/All/AddSapforPackage.java
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
package Visual_DVM_2021.Passes.All;
|
||||||
|
import Visual_DVM_2021.Passes.Pass_2021;
|
||||||
|
public class AddSapforPackage extends Pass_2021 {
|
||||||
|
}
|
||||||
@@ -1,11 +1,14 @@
|
|||||||
package Visual_DVM_2021.Passes.All;
|
package Visual_DVM_2021.Passes.All;
|
||||||
|
import Common.Constants;
|
||||||
import Common.Global;
|
import Common.Global;
|
||||||
import Common.UI.UI;
|
import Common.UI.UI;
|
||||||
import TestingSystem.Common.TestingServer;
|
import TestingSystem.Common.TestingServer;
|
||||||
import TestingSystem.DVM.DVMPackage.DVMPackage;
|
import TestingSystem.DVM.DVMPackage.DVMPackage;
|
||||||
import TestingSystem.DVM.TasksPackage.TasksPackageState;
|
|
||||||
import Visual_DVM_2021.Passes.DeleteServerObjects;
|
import Visual_DVM_2021.Passes.DeleteServerObjects;
|
||||||
|
|
||||||
|
import java.util.Vector;
|
||||||
public class DeleteDVMPackage extends DeleteServerObjects<TestingServer, DVMPackage> {
|
public class DeleteDVMPackage extends DeleteServerObjects<TestingServer, DVMPackage> {
|
||||||
|
boolean delete_draft;
|
||||||
public DeleteDVMPackage() {
|
public DeleteDVMPackage() {
|
||||||
super(Global.testingServer, DVMPackage.class);
|
super(Global.testingServer, DVMPackage.class);
|
||||||
}
|
}
|
||||||
@@ -26,10 +29,39 @@ public class DeleteDVMPackage extends DeleteServerObjects<TestingServer, DVMPack
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
return super.canStart(args) && checkActivity();
|
delete_draft = false;
|
||||||
|
Vector<Object> target_ = new Vector<>();
|
||||||
|
if (super.canStart(args) && checkActivity()) {
|
||||||
|
for (Object key : target) {
|
||||||
|
int id = (int) key;
|
||||||
|
if (id == Constants.Nan) {
|
||||||
|
delete_draft = true;
|
||||||
|
} else {
|
||||||
|
target_.add(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//-
|
||||||
|
if (delete_draft) {
|
||||||
|
if (target.size() == 1) {
|
||||||
|
DeleteDraftOnly();
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
target = target_;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
void DeleteDraftOnly() throws Exception {
|
||||||
|
showPreparation();
|
||||||
|
server.db.dvmPackages.Data.remove(Constants.Nan);
|
||||||
|
server.db.dvmPackages.ShowUI();
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void showPreparation() throws Exception {
|
protected void showPreparation() throws Exception {
|
||||||
|
super.showPreparation();
|
||||||
UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison();
|
UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -315,11 +315,15 @@ public enum PassCode_2021 {
|
|||||||
DeleteDVMPackage,
|
DeleteDVMPackage,
|
||||||
AbortDVMPackage,
|
AbortDVMPackage,
|
||||||
//->
|
//->
|
||||||
|
AddSapforPackage,
|
||||||
|
//->
|
||||||
TestPass;
|
TestPass;
|
||||||
public String getDescription() {
|
public String getDescription() {
|
||||||
switch (this) {
|
switch (this) {
|
||||||
case Undefined:
|
case Undefined:
|
||||||
return "?";
|
return "?";
|
||||||
|
case AddSapforPackage:
|
||||||
|
return "Добавить пакет задач SAPFOR";
|
||||||
case AbortDVMPackage:
|
case AbortDVMPackage:
|
||||||
return "Прервать пакет тестирования DVM";
|
return "Прервать пакет тестирования DVM";
|
||||||
case DeleteDVMPackage:
|
case DeleteDVMPackage:
|
||||||
|
|||||||
Reference in New Issue
Block a user