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
2024-09-16 15:41:43 +03:00
parent 7ea64c49d1
commit d4d8d255fb
27 changed files with 72 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/TestingSystem/DVM/Configuration/DVMConfiguration.java → src/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.DVM.Configuration;
package TestingSystem.DVM.DVMConfiguration;
import Common.Database.DBObject;
import Common.Utils.Utils;
import GlobalData.RunConfiguration.RunConfiguration;

4
src/TestingSystem/DVM/Configuration/DVMConfigurationDBTable.java → src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.DVM.Configuration;
package TestingSystem.DVM.DVMConfiguration;
import Common.Current;
import Common.Database.DBObject;
import Common.Database.iDBTable;
@@ -7,7 +7,7 @@ import Common.UI.Tables.TableRenderers;
import Common.UI.VisualiserStringList;
import Common.UI.Windows.Dialog.DBObjectDialog;
import Common.Utils.Utils;
import TestingSystem.DVM.Configuration.UI.ConfigurationFields;
import TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields;
public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
public DVMConfigurationDBTable() {
super(DVMConfiguration.class);

2
src/TestingSystem/DVM/Configuration/DVMConfigurationsMenuBar.java → src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.DVM.Configuration;
package TestingSystem.DVM.DVMConfiguration;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class DVMConfigurationsMenuBar extends DataMenuBar {

4
src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.form → src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.form
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.DVM.Configuration.UI.ConfigurationFields">
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields">
<grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
@@ -15,7 +15,7 @@
</grid>
</constraints>
<properties>
<dividerLocation value="727"/>
<dividerLocation value="500"/>
<dividerSize value="3"/>
</properties>
<border type="none"/>

2
src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.java → src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.DVM.Configuration.UI;
package TestingSystem.DVM.DVMConfiguration.UI;
import Common.Current;
import Common.UI.VisualiserStringList;
import Common.UI.TextField.StyledTextField;

38
src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
View File

@@ -40,11 +40,11 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
@Override
protected void AdditionalInitColumns() {
columns.get(6).setRenderer(RendererMultiline);
columns.get(7).setRenderer(RendererMultiline);
columns.get(11).setRenderer(RendererProgress);
columns.get(12).setRenderer(RendererDate);
columns.get(13).setRenderer(RendererDate);
columns.get(14).setRenderer(RendererStatusEnum);
// columns.get(7).setRenderer(RendererMultiline);
columns.get(9).setRenderer(RendererProgress);
columns.get(10).setRenderer(RendererDate);
columns.get(11).setRenderer(RendererDate);
columns.get(12).setRenderer(RendererStatusEnum);
}
@Override
public void ShowCurrentObject() throws Exception {
@@ -71,8 +71,8 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
"DVM",
//-
"конфигурации",
"группы",
"тестов",
// "группы",
// "тестов",
//-
"Задач",
"Ядер",
@@ -83,11 +83,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
};
}
public static Vector<String> getConfigurationsNames(TestingPackage object){
String[] data = object.configurationsNames.split(";");
return new Vector<String>(Arrays.asList(data));
}
public static Vector<String> getGroupsNames(TestingPackage object){
String[] data = object.groupsNames.split(";");
String[] data = object.packedConfigurationsNames.split("\n");
return new Vector<String>(Arrays.asList(data));
}
@@ -104,21 +100,21 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
return object.version;
case 6:
return getConfigurationsNames(object);
// case 7:
// return getGroupsNames(object);
// case 8:
// return object.testsCount;
case 7:
return getGroupsNames(object);
case 8:
return object.testsCount;
case 9:
return object.tasksCount;
case 10:
case 8:
return object.kernels;
case 11:
case 9:
return object.progress;
case 12:
case 10:
return new Date(object.StartDate);
case 13:
case 11:
return new Date(object.ChangeDate);
case 14:
case 12:
return object.state;
default:
return null;

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

@@ -17,15 +17,12 @@ public class DVMPackagesBar extends DataMenuBar {
// PassCode_2021.AddTasksToDVMPackage
);
addSeparator();
addPasses(PassCode_2021.ShowCurrentDVMPackage, PassCode_2021.SaveCurrentDVMPackage
// PassCode_2021.CloneDVMPackage
);
// addPasses(PassCode_2021.CloneDVMPackage);
addSeparator();
addPasses(PassCode_2021.DeleteDVMPackage);
addSeparator();
addPasses(PassCode_2021.StartDVMPackage,
PassCode_2021.AbortDVMPackage);
addPasses(PassCode_2021.AbortDVMPackage);
addSeparator();
addPasses(PassCode_2021.DownloadDVMPackage,
PassCode_2021.ExportDVMPackageToExcel);

2
src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
View File

@@ -1,7 +1,7 @@
package TestingSystem.DVM.DVMTasks;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import com.google.gson.annotations.Expose;
import java.util.List;

2
src/TestingSystem/DVM/DVMTasks/DVMRunTask.java
View File

@@ -7,7 +7,7 @@ import GlobalData.Tasks.TaskState;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.Test.TestType;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import com.google.gson.annotations.Expose;
import java.io.File;

2
src/TestingSystem/DVM/DVMTasks/DVMTask.java
View File

@@ -8,7 +8,7 @@ import ProjectData.LanguageName;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.Test.TestType;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import com.google.gson.annotations.Expose;
import org.apache.commons.io.FileUtils;