no message
This commit is contained in:
@@ -5,7 +5,7 @@ import _VisualDVM.Global;
|
||||
import Common.Utils.TextLog;
|
||||
import _VisualDVM.TestingSystem.Common.Settings.Settings;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
import Visual_DVM_2021.Passes.PassCode;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Vector;
|
||||
@@ -50,22 +50,22 @@ public class SapforSettings extends Settings {
|
||||
}
|
||||
public SapforSettings() {
|
||||
}
|
||||
public Vector<PassCode_2021> getCodes() {
|
||||
Vector<PassCode_2021> res = new Vector<>();
|
||||
public Vector<PassCode> getCodes() {
|
||||
Vector<PassCode> res = new Vector<>();
|
||||
for (SapforSettingsCommand command : Global.testingServer.db.sapforSettingsCommands.Data.values())
|
||||
if (command.sapforsettings_id == id) res.add(command.passCode);
|
||||
return res;
|
||||
}
|
||||
public List<PassCode_2021> getCheckedCodes(){
|
||||
Vector<PassCode_2021> res = getCodes();
|
||||
if (!res.firstElement().equals(PassCode_2021.SPF_InsertIncludesPass))
|
||||
res.insertElementAt(PassCode_2021.SPF_CorrectCodeStylePass,0); //всегда добавляется.
|
||||
public List<PassCode> getCheckedCodes(){
|
||||
Vector<PassCode> res = getCodes();
|
||||
if (!res.firstElement().equals(PassCode.SPF_InsertIncludesPass))
|
||||
res.insertElementAt(PassCode.SPF_CorrectCodeStylePass,0); //всегда добавляется.
|
||||
return res;
|
||||
}
|
||||
@Override
|
||||
public boolean validate(TextLog Log) {
|
||||
boolean res = true;
|
||||
Vector<PassCode_2021> codes = getCodes();
|
||||
Vector<PassCode> codes = getCodes();
|
||||
if (codes.size() == 0) {
|
||||
Log.Writeln_("Настройки:" + id + " не содержат ни одного прохода.");
|
||||
return false;
|
||||
@@ -73,9 +73,9 @@ public class SapforSettings extends Settings {
|
||||
//-
|
||||
int first = 0;
|
||||
int last = codes.size() - 1;
|
||||
Vector<PassCode_2021> matches = new Vector<>();
|
||||
Vector<PassCode> matches = new Vector<>();
|
||||
for (int i = 0; i < codes.size(); ++i) {
|
||||
PassCode_2021 code = codes.get(i);
|
||||
PassCode code = codes.get(i);
|
||||
if (code.isSapforStart()) {
|
||||
if (i > first) {
|
||||
Log.Writeln_("Неверные настройки:" + id + ": проход" +
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
package _VisualDVM.TestingSystem.SAPFOR.SapforSettings;
|
||||
import Common.Visual.Menus.DataMenuBar;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
import Visual_DVM_2021.Passes.PassCode;
|
||||
public class SapforSettingsBar extends DataMenuBar {
|
||||
public SapforSettingsBar() {
|
||||
super("параметры тестирования",
|
||||
PassCode_2021.PublishSapforSettings,
|
||||
PassCode_2021.CloneSapforSettings,
|
||||
PassCode_2021.EditSapforSettings,
|
||||
PassCode_2021.DeleteSapforSettings
|
||||
PassCode.PublishSapforSettings,
|
||||
PassCode.CloneSapforSettings,
|
||||
PassCode.EditSapforSettings,
|
||||
PassCode.DeleteSapforSettings
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,13 +3,13 @@ import Common.Visual.CommonUI;
|
||||
import Common.Visual.Tables.StyledCellLabel;
|
||||
import Common.Visual.Windows.Dialog.DialogFields;
|
||||
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
import Visual_DVM_2021.Passes.PassCode;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
public class SapforSettingsCommandFields implements DialogFields {
|
||||
private JPanel content;
|
||||
public JComboBox<PassCode_2021> cbPassCode;
|
||||
public JComboBox<PassCode> cbPassCode;
|
||||
@Override
|
||||
public Component getContent() {
|
||||
return content;
|
||||
@@ -26,7 +26,7 @@ public class SapforSettingsCommandFields implements DialogFields {
|
||||
return res;
|
||||
});
|
||||
//-
|
||||
for (PassCode_2021 code : Sapfor.getScenariosCodes())
|
||||
for (PassCode code : Sapfor.getScenariosCodes())
|
||||
cbPassCode.addItem(code);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user