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-24 20:22:41 +03:00
parent 797f232347
commit 33e6abfbf5
7 changed files with 96 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
View File

@@ -8,10 +8,12 @@ import Common.UI.VisualCache.ConfigurationCache;
import Common.UI.VisualCache.VisualCaches;
import Common.UI.Windows.Dialog.DBObjectDialog;
import Common.Utils.Utils;
import Common.Utils.Vector_;
import TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import java.util.LinkedHashMap;
import java.util.Vector;
public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
public SapforConfigurationDBTable() {
super(SapforConfiguration.class);
@@ -30,7 +32,7 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this){
return new DataSetControlForm(this) {
@Override
public boolean hasCheckBox() {
return true;
@@ -75,7 +77,6 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
return cache.getTestsCount();
case 8:
return object.getFlags();
default:
return null;
}
@@ -113,7 +114,7 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
Result.KEEP_SPF_DIRECTIVES = Utils.fromBoolean(fields.cbKEEP_SPF_DIRECTIVES.isSelected());
Result.STATIC_SHADOW_ANALYSIS = Utils.fromBoolean(fields.cbSTATIC_SHADOW_ANALYSIS.isSelected());
Result.MAX_SHADOW_WIDTH = fields.sMAX_SHADOW_WIDTH.getValue();
Result.kernels= (int)fields.sKernels.getValue();
Result.kernels = (int) fields.sKernels.getValue();
}
@Override
public void SetReadonly() {
@@ -128,5 +129,12 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
res.put(SapforConfigurationCommand.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
return res;
}
public Vector<SapforConfiguration> getAutoConfigurations() {
Vector<SapforConfiguration> res = new Vector_<>();
for (SapforConfiguration configuration : Data.values()) {
if (configuration.autoTesting != 0)
res.add(configuration);
}
return res;
}
}

7
src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
View File

@@ -95,7 +95,10 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
}
//---------
//конструктор. если 0 задач по итогу,значит пакет не запускаем вообще, и смотрим журнал.
public SapforPackage(Account account, ServerSapfor serverSapfor, Vector<SapforConfiguration> configurations, TextLog Log) throws Exception{
//Запрещено выполнять на нитях, так как прямой доступ к бд.
public SapforPackage(Account account, ServerSapfor serverSapfor, Vector<SapforConfiguration> configurations,
int neeedsEmail_in,
TextLog Log) throws Exception{
id = Constants.Nan;
sender_name = account.name;
sender_address = account.email;
@@ -104,8 +107,8 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
//-
drv = serverSapfor.call_command;
version = serverSapfor.version;
needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0;
///-------------------------------
needsEmail = neeedsEmail_in;
package_json = new SapforPackage_json();
package_json.sapfor_drv = serverSapfor.call_command;
//-