no message
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
package _VisualDVM.TestingSystem.SAPFOR.SapforTask;
|
||||
import Common.Visual.StatusEnum;
|
||||
import Common.Visual.Fonts.VisualiserFonts;
|
||||
import Common.Visual.StatusEnum;
|
||||
public enum ComparisonState implements StatusEnum {
|
||||
Unknown,
|
||||
NotMatch,
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
package _VisualDVM.TestingSystem.SAPFOR.SapforTask;
|
||||
import Common.CommonConstants;
|
||||
import Common.Utils.Utils_;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Utils.Utils_;
|
||||
import _VisualDVM.GlobalData.Tasks.TaskState;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
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 _VisualDVM.Passes.PassCode;
|
||||
import com.google.gson.annotations.Expose;
|
||||
import com.sun.org.glassfish.gmbal.Description;
|
||||
|
||||
@@ -55,6 +55,28 @@ public class SapforTask extends DBObject {
|
||||
public TaskState state = TaskState.Inactive;
|
||||
@Description("IGNORE")
|
||||
public ComparisonState comparisonState = ComparisonState.Unknown; //для сравнения. в обычном режиме всегда Unknown!
|
||||
//-----------
|
||||
public SapforTask() {
|
||||
}
|
||||
public SapforTask(SapforTask src) {
|
||||
this.SynchronizeFields(src);
|
||||
}
|
||||
//-
|
||||
public SapforTask(SapforTestingSet_json testingSet, SapforTest_json test, SapforConfiguration_json sapforConfiguration_json) {
|
||||
id = CommonConstants.Nan;
|
||||
set_id = testingSet.id;
|
||||
sapfortaskspackage_id = CommonConstants.Nan;
|
||||
//-- unique key--
|
||||
group_description = test.group_description;
|
||||
test_description = test.description;
|
||||
sapfor_configuration_id = sapforConfiguration_json.id;
|
||||
//---------------
|
||||
flags = sapforConfiguration_json.flags;
|
||||
Vector<String> codes_s = new Vector<>();
|
||||
for (PassCode code : sapforConfiguration_json.codes)
|
||||
codes_s.add(code.toString());
|
||||
codes = String.join(" ", codes_s);
|
||||
}
|
||||
//--------------------------------------------------
|
||||
public String getUniqueKey() {
|
||||
return group_description + "_" + test_description + "_" + sapfor_configuration_id;
|
||||
@@ -67,17 +89,11 @@ public class SapforTask extends DBObject {
|
||||
lines.add(flags);
|
||||
return String.join(" ", lines);
|
||||
}
|
||||
//-----------
|
||||
public SapforTask() {
|
||||
}
|
||||
public void Reset() {
|
||||
state = TaskState.Inactive;
|
||||
versions.clear();
|
||||
variants.clear();
|
||||
}
|
||||
public SapforTask(SapforTask src) {
|
||||
this.SynchronizeFields(src);
|
||||
}
|
||||
@Override
|
||||
public Object getPK() {
|
||||
return id;
|
||||
@@ -141,7 +157,7 @@ public class SapforTask extends DBObject {
|
||||
version1.comparisonState = VersionComparisonState.NotMatch;
|
||||
version2.comparisonState = VersionComparisonState.NotMatch;
|
||||
//-
|
||||
}else {
|
||||
} else {
|
||||
version1.comparisonState = VersionComparisonState.Match;
|
||||
version2.comparisonState = VersionComparisonState.Match;
|
||||
//-
|
||||
@@ -222,20 +238,4 @@ public class SapforTask extends DBObject {
|
||||
res.add(versions_info);
|
||||
return res;
|
||||
}
|
||||
//-
|
||||
public SapforTask(SapforTestingSet_json testingSet, SapforTest_json test, SapforConfiguration_json sapforConfiguration_json) {
|
||||
id = CommonConstants.Nan;
|
||||
set_id = testingSet.id;
|
||||
sapfortaskspackage_id = CommonConstants.Nan;
|
||||
//-- unique key--
|
||||
group_description = test.group_description;
|
||||
test_description = test.description;
|
||||
sapfor_configuration_id = sapforConfiguration_json.id;
|
||||
//---------------
|
||||
flags = sapforConfiguration_json.flags;
|
||||
Vector<String> codes_s = new Vector<>();
|
||||
for (PassCode code : sapforConfiguration_json.codes)
|
||||
codes_s.add(code.toString());
|
||||
codes = String.join(" ", codes_s);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user