M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

++

Browse Source 
упразднение джсон в описании конфигураций
This commit is contained in:
02090095
2025-03-23 22:03:17 +03:00
parent af644f8f04
commit 535053baca
14 changed files with 76 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
View File

@@ -6,10 +6,12 @@ import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforPackage_json;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration.SapforPackageConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import com.sun.org.glassfish.gmbal.Description;
@@ -24,6 +26,8 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
@Description("DEFAULT 0")
public int mismatchesCount = 0; //различия с эталоном
//--
@Description("IGNORE")
public Vector<SapforPackageConfiguration> configurations = null;
public SapforPackage() {
}
public SapforPackage(SapforPackage sapforPackage) {
@@ -121,4 +125,11 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
}
return log.isEmpty();
}
@Override
public void saveConfigurations(Vector<? extends Configuration> configurations_in) {
configurations = new Vector<>();
for (Configuration configuration : configurations_in) {
configurations.add(new SapforPackageConfiguration((SapforConfiguration) configuration));
}
}
}

9
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java
View File

@@ -1,8 +1,15 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration;
import Common.CommonConstants;
import Common.Database.Objects.iDBObject;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
public class SapforPackageConfiguration extends iDBObject {
public int sapforpackage_id = CommonConstants.Nan;
public int sapforconfiguration_id = CommonConstants.Nan;
public String description ="";
public String description = "";
public SapforPackageConfiguration() {
}
public SapforPackageConfiguration(SapforConfiguration configuration_in) {
sapforconfiguration_id = configuration_in.id;
description = configuration_in.description;
}
}