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-15 01:36:19 +03:00
parent 1e782daa3d
commit 7ea64c49d1
18 changed files with 488 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Common/Current.java
View File

@@ -86,7 +86,7 @@ public enum Current {
Scenario,
ScenarioCommand,
//-
Configuration,
DVMConfiguration,
Group,
//-
DVMParameterValue,
@@ -224,10 +224,10 @@ public enum Current {
}
//--
public static boolean HasConfiguration() {
return get(Current.Configuration) != null;
return get(Current.DVMConfiguration) != null;
}
public static DVMConfiguration getConfiguration() {
return (DVMConfiguration) get(Current.Configuration);
public static DVMConfiguration getDVMConfiguration() {
return (DVMConfiguration) get(Current.DVMConfiguration);
}
public static SapforConfiguration getSapforConfiguration() {
return (TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
@@ -381,7 +381,7 @@ public enum Current {
return "Пакет тестирования SAPFOR";
case DVMPackage:
return "Пакет тестирования DVM";
case Configuration:
case DVMConfiguration:
return "Конфигурация тестирования";
case ServerSapfor:
return "тестовая версия SAPFOR";

7
src/Common/UI/UI.java
View File

@@ -66,8 +66,8 @@ import TestingSystem.Common.Group.GroupsMenuBar;
import TestingSystem.Common.Test.TestDBTable;
import TestingSystem.Common.Test.TestsMenuBar;
import TestingSystem.Common.TestingBar;
import TestingSystem.DVM.Configuration.ConfigurationDBTable;
import TestingSystem.DVM.Configuration.ConfigurationsMenuBar;
import TestingSystem.DVM.Configuration.DVMConfigurationDBTable;
import TestingSystem.DVM.Configuration.DVMConfigurationsMenuBar;
import TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
import TestingSystem.DVM.DVMPackage.DVMPackagesBar;
import TestingSystem.DVM.DVMTasks.DVMRunTasksBar;
@@ -101,7 +101,6 @@ import javax.swing.text.Highlighter;
import javax.swing.tree.TreeCellRenderer;
import java.awt.*;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Stack;
import java.util.Vector;
@@ -226,7 +225,7 @@ public class UI {
//---------------------------------------------------->>
menuBars.put(GroupsDBTable.class, new GroupsMenuBar());
menuBars.put(TestDBTable.class, new TestsMenuBar());
menuBars.put(ConfigurationDBTable.class, new ConfigurationsMenuBar());
menuBars.put(DVMConfigurationDBTable.class, new DVMConfigurationsMenuBar());
menuBars.put(DVMPackageDBTable.class, new DVMPackagesBar());
menuBars.put(SapforPackageDBTable.class, new SapforPackagesBar());
menuBars.put(DVMRunTasksSet.class, new DVMRunTasksBar());

8
src/Common/Utils/Utils.java
View File

@@ -1289,9 +1289,9 @@ public class Utils {
return dates.firstElement();
}
//------------------------------------------------------->>>
public static Vector<Integer> unpack(String packed){
public static Vector<Integer> unpackIntegers(String packed, String separator){
Vector<Integer> ids = new Vector<>();
String[] data = packed.split("\n");
String[] data = packed.split(separator);
if (data.length > 0) {
for (String s: data) {
if (!s.isEmpty())
@@ -1300,9 +1300,9 @@ public class Utils {
}
return ids;
}
public static Vector<String> unpack_s(String packed){
public static Vector<String> unpack_s(String packed, String separator){
Vector<String> ids = new Vector<>();
String[] data = packed.split("\n");
String[] data = packed.split(separator);
if (data.length > 0) {
for (String s: data) {
if (!s.isEmpty())