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

no message

Browse Source
This commit is contained in:
02090095
2023-12-15 20:39:49 +03:00
parent ac5757160e
commit b7b41ae59c
4 changed files with 65 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/workspace.xml generated
View File

@@ -7,13 +7,7 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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" />
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/DeleteTestingPackages.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

2
properties
View File

@@ -26,7 +26,7 @@
"PerformanceAnalyzerPath": "",
"ComponentsBackUpsCount": 10,
"TestingKernels": 28,
"AutoCheckTesting": true,
"AutoCheckTesting": false,
"CheckTestingIntervalSeconds": 10,
"EmailOnTestingProgress": false
}

54
src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java
View File

@@ -5,61 +5,13 @@ import Common.UI.UI;
import TestingSystem.Common.TestingServer;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import Visual_DVM_2021.Passes.DeleteServerObjects;
import Visual_DVM_2021.Passes.DeleteTestingPackages;
import java.util.Vector;
public class DeleteDVMPackage extends DeleteServerObjects<TestingServer, DVMPackage> {
boolean delete_draft;
public class DeleteDVMPackage extends DeleteTestingPackages<DVMPackage> {
public DeleteDVMPackage() {
super(Global.testingServer, DVMPackage.class);
super(DVMPackage.class);
}
//---
public boolean checkActivity() {
/*
for (Object key : target) {
DVMPackage tasksPackage = server.db.dvmPackages.get(key);
if (!tasksPackage.state.equals(TasksPackageState.Done) &&
!tasksPackage.state.equals(TasksPackageState.Aborted)
) {
Log.Writeln_("Нельзя удалить активный пакет " + key + " !");
return false;
}
}
*/
return true;
}
@Override
protected boolean canStart(Object... args) throws Exception {
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
protected void showPreparation() throws Exception {
super.showPreparation();
UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison();

60
src/Visual_DVM_2021/Passes/DeleteTestingPackages.java Normal file
View File

@@ -0,0 +1,60 @@
package Visual_DVM_2021.Passes;
import Common.Constants;
import Common.Global;
import Common.UI.UI;
import TestingSystem.Common.TestingPackage.TestingPackage;
import TestingSystem.Common.TestingServer;
import java.util.Vector;
public class DeleteTestingPackages<P extends TestingPackage> extends DeleteServerObjects<TestingServer, P>{
boolean delete_draft;
public DeleteTestingPackages(Class<P> p) {
super(Global.testingServer, p);
}
public boolean checkActivity() {
/*
for (Object key : target) {
DVMPackage tasksPackage = server.db.dvmPackages.get(key);
if (!tasksPackage.state.equals(TasksPackageState.Done) &&
!tasksPackage.state.equals(TasksPackageState.Aborted)
) {
Log.Writeln_("Нельзя удалить активный пакет " + key + " !");
return false;
}
}
*/
return true;
}
@Override
protected boolean canStart(Object... args) throws Exception {
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();
getDb().tables.get(d).Data.remove(Constants.Nan);
getDb().tables.get(d).ShowUI();
}
}