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

промежуточный. хранение инфы о конфигах, группах и тестах пакета.пока отлаживается.

Browse Source
This commit is contained in:
02090095
2024-09-10 01:50:44 +03:00
parent 958ccbc9ab
commit 151572fd82
21 changed files with 274 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
View File

@@ -4,18 +4,21 @@ import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.TasksPackageState;
import TestingSystem.Common.Test.Test;
import TestingSystem.DVM.Configuration.Configuration;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import TestingSystem.DVM.DVMPackage.DVMPackage_json;
import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import TestingSystem.DVM.DVMTasks.DVMRunTask;
import TestingSystem.Common.TasksPackageState;
import Visual_DVM_2021.Passes.Pass_2021;
import java.util.Vector;
public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
Vector<DVMCompilationTask> tasks;
Vector<Configuration> configurations;
Vector<Group> groups;
Vector<Test> tests;
int tasks_count;
@Override
public String getIconPath() {
@@ -102,6 +105,9 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
}
//---
tasks = new Vector<>();
configurations = new Vector<>();
groups = new Vector<>();
tests = new Vector<>();
tasks_count = 0;
//-----------
//1, Проверяем выбраны ли конфиги.
@@ -112,6 +118,7 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
if (Global.testingServer.db.groups.getCheckedCount() > 0) {
//2 Проверяем выбраны ли группы.
for (TestingSystem.DVM.Configuration.Configuration configuration : Global.testingServer.db.configurations.getCheckedItems()) {
configurations.add(configuration);
for (Group group : Global.testingServer.db.groups.getCheckedItems()) {
Vector<Test> groupTests = new Vector<>();
Vector<Test> checkedGroupTests = new Vector<>();
@@ -123,15 +130,20 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
}
}
if (!groupTests.isEmpty()) {
groups.add(group);
if (checkedGroupTests.isEmpty()) {
for (Test test : groupTests)
for (Test test : groupTests) {
tasks.addAll(createTasksCGT(configuration, group, test));
tests.add(test);
}
} else {
//добавляем только отмеченные.
for (Test test : checkedGroupTests) {
tasks.addAll(createTasksCGT(configuration, group, test));
tests.add(test);
}
}
//--
}
}
}
@@ -161,8 +173,15 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
}
}
json.compilationTasks.addAll(tasks);
//--
target.addConfigurations(configurations);
target.addGroups(groups);
target.addTests(tests);
//--
target.tasksCount += tasks_count;
Global.testingServer.db.Update(target);
//--
target.printCGT();
}
@Override
protected void showDone() throws Exception {

42
src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
View File

@@ -1,40 +1,36 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.UI.Windows.Dialog.Dialog;
import Common.Utils.Utils;
import GlobalData.FileObject.FileObject;
import GlobalData.FileObject.FileObjectsDataSet;
import GlobalData.FileObject.FileObjectsFields;
import GlobalData.FileObject.DirInfo;
import GlobalData.FileObject.DirInfosDataSet;
import GlobalData.FileObject.DirInfosFields;
import GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.UI.CopyProjectFields;
import javax.swing.*;
import java.io.File;
import java.nio.file.Paths;
import java.util.*;
public class DeleteDownloadedBugReports extends Pass_2021<Vector<File>> {
public class DeleteDownloadedBugReports extends Pass_2021<DirInfosDataSet> {
@Override
protected boolean needsAnimation() {
return true;
}
@Override
public boolean needsConfirmations() {
return true;
}
@Override
protected boolean canStart(Object... args) throws Exception {
target = null;
if (passes.get(PassCode_2021.GetOldBugReports).Do()){
target = (Vector<File>) passes.get(PassCode_2021.GetOldBugReports).target;
FileObjectsDataSet set = new FileObjectsDataSet();
for (File file: target){
set.put(file.getName(),new FileObject(file));
target = (DirInfosDataSet) passes.get(PassCode_2021.GetOldBugReports).target;
if (target.Data.isEmpty()){
Log.Writeln_("Не найдено отчетов, не использовавшихся " +
Global.getSetting(SettingName.BugReportsAgeLimit).toInt32() +
" месяцев и более!");
return false;
}
//-
Dialog<Object, FileObjectsFields> dialog = new Dialog<Object, FileObjectsFields>(FileObjectsFields.class) {
Dialog<Object, DirInfosFields> dialog = new Dialog<Object, DirInfosFields>(DirInfosFields.class) {
@Override
public int getDefaultHeight() {
return 300;
@@ -45,14 +41,16 @@ public class DeleteDownloadedBugReports extends Pass_2021<Vector<File>> {
}
@Override
public void Init(Object... params) {
set.mountUI((JPanel) content);
set.ShowUI();
target.mountUI((JPanel) content);
target.ShowUI();
}
@Override
public void validateFields() {
}
};
if (dialog.ShowDialog("Найдено "+target.size()+" загруженных проектов. Удалить?")) {
if (dialog.ShowDialog("Найдено "+target.size()+" отчетов, не использовавшихся " +
Global.getSetting(SettingName.BugReportsAgeLimit).toInt32()+
" месяцев и более. Удалить?")) {
return true;
}
}
@@ -65,9 +63,9 @@ public class DeleteDownloadedBugReports extends Pass_2021<Vector<File>> {
}
@Override
protected void body() throws Exception {
for (File file : target) {
ShowMessage1(file.getName());
Utils.forceDeleteWithCheck(file);
for (DirInfo dir : target.Data.values()) {
ShowMessage1(dir.getPK().toString());
Utils.forceDeleteWithCheck(dir.getFile());
}
}
}

21
src/Visual_DVM_2021/Passes/All/GetOldBugReports.java
View File

@@ -1,16 +1,20 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import Common.Utils.Utils;
import GlobalData.FileObject.DirInfo;
import GlobalData.FileObject.DirInfosDataSet;
import GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.Pass_2021;
import java.io.File;
import java.util.*;
public class GetOldBugReports extends Pass_2021<Vector<File>> {
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
public class GetOldBugReports extends Pass_2021<DirInfosDataSet> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
target = new DirInfosDataSet();
return true;
}
@Override
protected boolean needsAnimation() {
@@ -24,16 +28,17 @@ public class GetOldBugReports extends Pass_2021<Vector<File>> {
//---
Calendar c = new GregorianCalendar();
c.setTimeInMillis(System.currentTimeMillis());
c.add(Calendar.MONTH, -2);
c.add(Calendar.MONTH, -Global.getSetting(SettingName.BugReportsAgeLimit).toInt32());
Date date = c.getTime();
System.out.println(date);
long border = date.getTime();
//--
for (File file: files){
for (File file : files) {
ShowMessage2(file.getName());
long mdate = Utils.getNewestFileDate(file);
if (mdate<=border){
target.add(file);
if (mdate <= border) {
DirInfo d = new DirInfo(file, mdate);
target.put(d.getPK(), d);
}
}
}

7
src/Visual_DVM_2021/Passes/All/UpdateSetting.java
View File

@@ -78,6 +78,13 @@ public class UpdateSetting extends Pass_2021<DBSetting> {
if (f_.ShowDialog(target.Name.getDescription()))
NewValue = String.valueOf(f_.Result);
break;
case BugReportsAgeLimit:
min = 1;
max = 12;
SliderNumberForm fffff = new SliderNumberForm();
if (fffff.ShowDialog(target.Name.getDescription(), target.toInt32(), min, max))
NewValue = String.valueOf(fffff.Result);
break;
case FastAccessPassesCount:
min = 5;
max = 15;