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-10-09 23:37:58 +03:00
parent eb278676cc
commit d1ffab1e70
299 changed files with 1844 additions and 1539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java
View File

@@ -5,17 +5,17 @@ import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.TestingSystem.Common.Group.UI.AddGroupMenu;
import _VisualDVM.TestingSystem.Common.Group.UI.EditGroupMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javax.swing.*;
public class GroupsMenuBar extends DataMenuBar {
public GroupsMenuBar() {
super("группы",
PassCode_2021.SynchronizeTests,
PassCode_2021.ConvertCorrectnessTests
PassCode.SynchronizeTests,
PassCode.ConvertCorrectnessTests
);
addMenus(new AddGroupMenu(), new EditGroupMenu());
addPasses(PassCode_2021.DeleteGroup);
addPasses(PassCode.DeleteGroup);
add(new JSeparator());
add(new MenuBarButton() {
{

4
src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.TestingSystem.Common.Group.UI;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class AddGroupMenu extends VisualiserMenu {
public AddGroupMenu() {
super("", "/icons/RedAdd.png");
addPasses(PassCode_2021.PublishGroup,PassCode_2021.CreateGroupFromDirectory,PassCode_2021.CreateGroupFromFiles);
addPasses(PassCode.PublishGroup, PassCode.CreateGroupFromDirectory, PassCode.CreateGroupFromFiles);
}
}

4
src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.TestingSystem.Common.Group.UI;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class EditGroupMenu extends VisualiserMenu {
public EditGroupMenu() {
super("", "/icons/Edit.png" );
addPasses(PassCode_2021.EditGroup, PassCode_2021.ReplaceTestsFromFiles);
addPasses(PassCode.EditGroup, PassCode.ReplaceTestsFromFiles);
}
}

4
src/_VisualDVM/TestingSystem/Common/Test/TestsMenuBar.java
View File

@@ -2,11 +2,11 @@ package _VisualDVM.TestingSystem.Common.Test;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.TestingSystem.Common.Test.UI.AddTestMenu;
import _VisualDVM.TestingSystem.Common.Test.UI.EditTestMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class TestsMenuBar extends DataMenuBar {
public TestsMenuBar() {
super("тесты");
addMenus(new AddTestMenu(), new EditTestMenu());
addPasses(PassCode_2021.DownloadTest,PassCode_2021.DeleteTest);
addPasses(PassCode.DownloadTest, PassCode.DeleteTest);
}
}

12
src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.TestingSystem.Common.Test.UI;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class AddTestMenu extends VisualiserMenu {
public AddTestMenu() {
super("Добавление теста", "/icons/RedAdd.png", false);
add(Pass_2021.passes.get(PassCode_2021.CreateTestFromProject).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.CreateTestFromDirectory).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.CreateTestsFromFiles).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.CreateTestFromSelectedFiles).createMenuItem());
add(Pass.passes.get(PassCode.CreateTestFromProject).createMenuItem());
add(Pass.passes.get(PassCode.CreateTestFromDirectory).createMenuItem());
add(Pass.passes.get(PassCode.CreateTestsFromFiles).createMenuItem());
add(Pass.passes.get(PassCode.CreateTestFromSelectedFiles).createMenuItem());
}
}

8
src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.TestingSystem.Common.Test.UI;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class EditTestMenu extends VisualiserMenu {
public EditTestMenu() {
super("Редактирование теста", "/icons/Edit.png", false);
add(Pass_2021.passes.get(PassCode_2021.EditTest).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.ReplaceTestProject).createMenuItem());
add(Pass.passes.get(PassCode.EditTest).createMenuItem());
add(Pass.passes.get(PassCode.ReplaceTestProject).createMenuItem());
}
}

4
src/_VisualDVM/TestingSystem/Common/TestingBar.java
View File

@@ -5,7 +5,7 @@ import _VisualDVM.Global;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javax.swing.*;
import java.awt.*;
@@ -86,7 +86,7 @@ public class TestingBar extends VisualiserMenuBar {
});
addSeparator();
serverAdminLabel = addLabel(" управление сервером ");
addPasses(PassCode_2021.StartTestingServer, PassCode_2021.ShutdownTestingServer, PassCode_2021.PublishTestingServer);
addPasses(PassCode.StartTestingServer, PassCode.ShutdownTestingServer, PassCode.PublishTestingServer);
}
public void ShowAutoCheckTesting() {
autorefreshButton.setIcon(CommonUtils.getIcon(Global.properties.AutoCheckTesting ? "/icons/Pick.png" : "/icons/NotPick.png"));

6
src/_VisualDVM/TestingSystem/Common/TestingServer.java
View File

@@ -33,8 +33,8 @@ import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
import Visual_DVM_2021.Passes.All.DownloadRepository;
import Visual_DVM_2021.Passes.All.ZipFolderPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
@@ -154,7 +154,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
public static Timer checkTimer = null;
public static void TimerOn() {
checkTimer = new Timer(Global.properties.CheckTestingIntervalSeconds * 1000, e -> {
Pass_2021.passes.get(PassCode_2021.ActualizePackages).Do();
Pass.passes.get(PassCode.ActualizePackages).Do();
});
checkTimer.start();
}

6
src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
View File

@@ -28,7 +28,7 @@ import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
import Visual_DVM_2021.Passes.All.ZipFolderPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
@@ -74,8 +74,8 @@ public class TestsDatabase extends SQLiteDatabase {
addTable(dvmSettings=new DVMSettingsDBTable());
}
@Override
public PassCode_2021 getSynchronizePassCode() {
return PassCode_2021.SynchronizeTests;
public PassCode getSynchronizePassCode() {
return PassCode.SynchronizeTests;
}
public Vector<SapforPackage> getFirstActiveSapforPackagesCopies() {
Vector<SapforPackage> res = new Vector<>();

14
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java
View File

@@ -1,18 +1,18 @@
package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class DVMConfigurationsMenuBar extends DataMenuBar {
public DVMConfigurationsMenuBar() {
super("конфигурации");
addPasses(
PassCode_2021.PublishConfiguration,
PassCode.PublishConfiguration,
PassCode_2021.EditConfiguration,
PassCode_2021.ShowCurrentDVMConfigurationTests,
PassCode_2021.SaveCurrentDVMConfiguration,
PassCode_2021.DeleteConfiguration,
PassCode.EditConfiguration,
PassCode.ShowCurrentDVMConfigurationTests,
PassCode.SaveCurrentDVMConfiguration,
PassCode.DeleteConfiguration,
PassCode_2021.StartSelectedDVMConfigurations
PassCode.StartSelectedDVMConfigurations
);
}
}

6
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
View File

@@ -6,8 +6,8 @@ import Common.Visual.DataSetControlForm;
import _VisualDVM.Visual.UI;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import java.util.Comparator;
import java.util.Date;
@@ -63,7 +63,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
}
@Override
public void MouseAction2() throws Exception {
Pass_2021.passes.get(PassCode_2021.DownloadDVMPackage).Do();
Pass.passes.get(PassCode.DownloadDVMPackage).Do();
}
};

12
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
View File

@@ -3,19 +3,19 @@ import Common.Utils.CommonUtils;
import _VisualDVM.Global;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Controls.MenuBarButton;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javax.swing.*;
public class DVMPackagesBar extends DataMenuBar {
public DVMPackagesBar() {
super("пакеты задач DVM");
addPasses(PassCode_2021.SynchronizeTests);
addPasses(PassCode.SynchronizeTests);
addSeparator();
addPasses(PassCode_2021.AbortDVMPackage );
addPasses(PassCode.AbortDVMPackage );
addSeparator();
addPasses(PassCode_2021.DownloadDVMPackage,
PassCode_2021.ExportDVMPackageToExcel,
PassCode_2021.DeleteDVMPackage);
addPasses(PassCode.DownloadDVMPackage,
PassCode.ExportDVMPackageToExcel,
PassCode.DeleteDVMPackage);
add(new JSeparator());
add(new MenuBarButton() {
{

10
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class DVMSettingsBar extends DataMenuBar {
public DVMSettingsBar() {
super("параметры тестированя",
PassCode_2021.PublishDVMSettings,
PassCode_2021.CloneDVMSettings,
PassCode_2021.EditDVMSettings,
PassCode_2021.DeleteDVMSettings
PassCode.PublishDVMSettings,
PassCode.CloneDVMSettings,
PassCode.EditDVMSettings,
PassCode.DeleteDVMSettings
);
}
}

8
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
View File

@@ -2,8 +2,8 @@ package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
import _VisualDVM.Current;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.Windows.Dialog.DialogFields;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import java.awt.*;
@@ -38,7 +38,7 @@ public class DVMSettingsFields implements DialogFields {
bAddFlags.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021 pass = Pass_2021.passes.get(PassCode_2021.PickCompilerOptions);
Pass pass = Pass.passes.get(PassCode.PickCompilerOptions);
if (pass.Do(Current.getCompiler())) {
tfFlags.setText((String)pass.target);
}
@@ -47,7 +47,7 @@ public class DVMSettingsFields implements DialogFields {
bAddEnvironments.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021 pass = Pass_2021.passes.get(PassCode_2021.PickCompilerEnvironmentsForTesting);
Pass pass = Pass.passes.get(PassCode.PickCompilerEnvironmentsForTesting);
if (pass.Do(Current.getCompiler()))
tfEnvironments.setText((String)pass.target);
}

4
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.TestingSystem.DVM.DVMTasks;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class DVMRunTasksBar extends DataMenuBar {
public DVMRunTasksBar() {
super("задачи",
PassCode_2021.CompareDVMRunTasks, PassCode_2021.DownloadTaskTest);
PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
}
}

4
src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.TestingSystem.SAPFOR.Json;
import Common.CommonConstants;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import com.google.gson.annotations.Expose;
import java.io.Serializable;
@@ -16,7 +16,7 @@ public class SapforConfiguration_json implements Serializable {
@Expose
public String flags = "";
@Expose
public List<PassCode_2021> codes = new Vector<>();
public List<PassCode> codes = new Vector<>();
//--
public SapforConfiguration_json() {
}

14
src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java
View File

@@ -6,8 +6,8 @@ import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforVersion_json;
import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import java.io.File;
import java.nio.file.Paths;
@@ -15,7 +15,7 @@ import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
import java.util.Vector;
public class PerformSapforTask extends Pass_2021<SapforTask> {
public class PerformSapforTask extends Pass<SapforTask> {
@Override
public String getDescription() {
return "";
@@ -59,7 +59,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
}
}
//слегка изменить подход.
protected boolean transformation(PassCode_2021 code) throws Exception {
protected boolean transformation(PassCode code) throws Exception {
task = new File(parentTask, "v1");
Utils.CheckAndCleanDirectory(task); //папка для преобразования.
//если версия пустая, это тоже результат тестирования. Поэтому должна учитываться в древе.
@@ -103,7 +103,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
target.variants.add(
new SapforVersion_json(
root.getAbsolutePath(),
file.getAbsolutePath(), PassCode_2021.SPF_CreateParallelVariant.getDescription()));
file.getAbsolutePath(), PassCode.SPF_CreateParallelVariant.getDescription()));
}
}
//-------------------------------------------------->>
@@ -113,10 +113,10 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
target.versions.add(version_json = new SapforVersion_json(target.test_description, "исходная"));
String [] data = target.codes.split(" ");
for (String code_s: data){
PassCode_2021 code = PassCode_2021.valueOf(code_s);
PassCode code = PassCode.valueOf(code_s);
//--
if (parse()) {
if (code.equals(PassCode_2021.CreateParallelVariants))
if (code.equals(PassCode.CreateParallelVariants))
variants();
else if (!transformation(code))
break;

14
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java
View File

@@ -1,17 +1,17 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class SapforConfigurationsMenuBar extends DataMenuBar {
public SapforConfigurationsMenuBar() {
super("конфигурации",
PassCode_2021.PublishSapforConfiguration,
PassCode.PublishSapforConfiguration,
PassCode_2021.EditSapforConfiguration,
PassCode_2021.ShowCurrentSAPFORConfigurationTests,
PassCode_2021.SaveCurrentSAPFORConfiguration,
PassCode_2021.DeleteSapforConfiguration,
PassCode.EditSapforConfiguration,
PassCode.ShowCurrentSAPFORConfigurationTests,
PassCode.SaveCurrentSAPFORConfiguration,
PassCode.DeleteSapforConfiguration,
PassCode_2021.StartSelectedSAPFORConfigurations
PassCode.StartSelectedSAPFORConfigurations
);
}
}

6
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
View File

@@ -4,8 +4,8 @@ import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import java.util.Comparator;
import java.util.Date;
@@ -46,7 +46,7 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
}
@Override
public void MouseAction2() throws Exception {
Pass_2021.passes.get(PassCode_2021.CompareSapforPackages).Do();
Pass.passes.get(PassCode.CompareSapforPackages).Do();
}
};
}

20
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java
View File

@@ -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 + ": проход" +

10
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java
View File

@@ -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
);
}
}

6
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
View File

@@ -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);
}
}

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java
View File

@@ -3,12 +3,12 @@ import Common.CommonConstants;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import com.sun.org.glassfish.gmbal.Description;
public class SapforSettingsCommand extends riDBObject {
@Description("DEFAULT -1")
public int sapforsettings_id = CommonConstants.Nan;
public PassCode_2021 passCode = PassCode_2021.SPF_RemoveDvmDirectives;
public PassCode passCode = PassCode.SPF_RemoveDvmDirectives;
@Override
public boolean isVisible() {
return Current.HasSapforSettings() && (Current.getSapforSettings().id == sapforsettings_id);

8
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class SapforSettingsCommandsBar extends DataMenuBar {
public SapforSettingsCommandsBar() {
super("команды",
PassCode_2021.PublishSapforSettingsCommand,
PassCode_2021.EditSapforSettingsCommand,
PassCode_2021.DeleteSapforSettingsCommand
PassCode.PublishSapforSettingsCommand,
PassCode.EditSapforSettingsCommand,
PassCode.DeleteSapforSettingsCommand
);
}
}

8
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
View File

@@ -6,7 +6,7 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsCommandFields;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import java.util.Vector;
public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsCommand> {
@@ -66,14 +66,14 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
}
@Override
public void ProcessResult() {
Result.passCode = (PassCode_2021) fields.cbPassCode.getSelectedItem();
Result.passCode = (PassCode) fields.cbPassCode.getSelectedItem();
Result.sapforsettings_id = Current.getSapforSettings().id;
}
};
}
//--
public Vector<PassCode_2021> getCodes(SapforSettings sapforSettings) {
Vector<PassCode_2021> res = new Vector<>();
public Vector<PassCode> getCodes(SapforSettings sapforSettings) {
Vector<PassCode> res = new Vector<>();
for (SapforSettingsCommand command : Data.values()) {
if (command.sapforsettings_id == sapforSettings.id)
res.add(command.passCode);

8
src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java
View File

@@ -7,7 +7,7 @@ import _VisualDVM.TestingSystem.SAPFOR.Json.*;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackageTreeNode;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTaskNode;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.VersionNode;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import com.google.gson.annotations.Expose;
import com.sun.org.glassfish.gmbal.Description;
@@ -105,7 +105,7 @@ public class SapforTask extends DBObject {
versionsLines.add(CommonUtils.Brackets(versions.get(i).description));
}
if (!variants.isEmpty()) {
versionsLines.add(CommonUtils.Brackets(PassCode_2021.CreateParallelVariants.getDescription()));
versionsLines.add(CommonUtils.Brackets(PassCode.CreateParallelVariants.getDescription()));
}
return String.join("→", versionsLines);
}
@@ -175,7 +175,7 @@ public class SapforTask extends DBObject {
String[] data = codes.split(" ");
Vector<String> strings = new Vector<>();
for (String code_s : data) {
PassCode_2021 code = PassCode_2021.valueOf(code_s);
PassCode code = PassCode.valueOf(code_s);
strings.add(CommonUtils.Brackets(code.getDescription()));
}
return String.join("→", strings);
@@ -234,7 +234,7 @@ public class SapforTask extends DBObject {
//---------------
flags = sapforConfiguration_json.flags;
Vector<String> codes_s = new Vector<>();
for (PassCode_2021 code : sapforConfiguration_json.codes)
for (PassCode code : sapforConfiguration_json.codes)
codes_s.add(code.toString());
codes = String.join(" ", codes_s);
}

10
src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
View File

@@ -4,19 +4,19 @@ import _VisualDVM.Global;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javax.swing.*;
public class SapforPackagesBar extends DataMenuBar {
public SapforPackagesBar() {
super("пакеты задач SAPFOR");
addPasses(PassCode_2021.SynchronizeTests);
addPasses(PassCode.SynchronizeTests);
addSeparator();
addPasses(PassCode_2021.AbortSapforPackage);
addPasses(PassCode.AbortSapforPackage);
addSeparator();
addPasses(PassCode_2021.CompareSapforPackages);
addPasses(PassCode.CompareSapforPackages);
addSeparator();
addPasses(PassCode_2021.DeleteSapforPackage);
addPasses(PassCode.DeleteSapforPackage);
add(new JSeparator());
add(new MenuBarButton() {
{

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
@@ -60,7 +60,7 @@ public class SapforTasksPackageTree extends DataTree {
//---
if (o instanceof SapforVersion_json) {
SapforVersion_json version = (SapforVersion_json) o;
CurrentAnchestor.set(current, version);
Current_.set(current, version);
if (current.equals(Current.SapforEtalonVersion))
UI.getMainWindow().getTestingWindow().ShowCurrentSapforPackageVersionEtalon();
else

10
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class ServerSapforsBar extends DataMenuBar {
public ServerSapforsBar() {
super("версии SAPFOR",
PassCode_2021.CompileServerSapfor,
PassCode_2021.ShowSapforCompilationOut,
PassCode_2021.ShowSapforCompilationErr,
PassCode_2021.DeleteServerSapfor
PassCode.CompileServerSapfor,
PassCode.ShowSapforCompilationOut,
PassCode.ShowSapforCompilationErr,
PassCode.DeleteServerSapfor
);
}
}