diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a3c0573a..3cb783ff 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,10 +9,9 @@
-
-
-
-
+
+
+
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 37985a76..0048b380 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -49,7 +49,7 @@ public class Constants {
//
//7996 отладочный порт.
public static final int ComponentsServerPort = 7995; //7795
- public static final int TestingServerPort = 7998; //7998
+ public static final int TestingServerPort = 7996; //7998
public static final int SocketTimeout = 0;
//-
public static final String ServerAddress = "alex-freenas.ddns.net";
diff --git a/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java b/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java
index d44bebcc..264e75fe 100644
--- a/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java
+++ b/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java
@@ -4,13 +4,6 @@ import Common.Database.Objects.riDBObject;
import Common.Utils.TextLog;
//предопределенный набор настроек тестируемой системы. сохраняется для упрощения.
public abstract class Settings extends riDBObject {
- public String flags = "";
- @Override
- public void SynchronizeFields(DBObject src) {
- super.SynchronizeFields(src);
- Settings s = (Settings) src;
- flags = s.flags;
- }
public boolean validate(TextLog Log) {
return true;
}
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java
index 6ea35108..77d2726e 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java
@@ -6,8 +6,6 @@ import com.sun.org.glassfish.gmbal.Description;
import java.util.Vector;
public class DVMSettings extends Settings {
- //todo.вывести. хранить флаги и окружение в json чтобы можно было в форме их видеть.
- //public String environments = "";
@Description("DEFAULT 0")
public int Is_DVM_STAT = 0; //флаг вмест usr par, которые не использовались.
//---
@@ -29,7 +27,6 @@ public class DVMSettings extends Settings {
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
DVMSettings c = (DVMSettings) src;
- // environments = c.environments; //todo вывести.
Is_DVM_STAT = c.Is_DVM_STAT;
packedCompilationOptionsJson = ((DVMSettings) src).packedCompilationOptionsJson;
packedRunEnvironmentValuesJson = ((DVMSettings) src).packedRunEnvironmentValuesJson;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java
index 3bae5372..b8e2b593 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java
@@ -16,6 +16,9 @@ public class SapforSettings extends Settings {
public int MAX_SHADOW_WIDTH = 50; // "Максимальный размер теневых граней"; (%) -shwidth значение поля
public int KEEP_SPF_DIRECTIVES = 0; //"Сохранять SPF директивы при построении параллельных вариантов"; -keepSPF
public int KEEP_DVM_DIRECTIVES = 0;// "Учитывать DVM директивы"; -keepDVM
+ //-
+ public String flags = "";
+ //-
public SapforSettings(SapforSettings sapforSettings) {
this.SynchronizeFields(sapforSettings);
}
@@ -49,6 +52,7 @@ public class SapforSettings extends Settings {
MAX_SHADOW_WIDTH = c.MAX_SHADOW_WIDTH;
KEEP_SPF_DIRECTIVES = c.KEEP_SPF_DIRECTIVES;
KEEP_DVM_DIRECTIVES = c.KEEP_DVM_DIRECTIVES;
+ flags = c.flags;
}
public Vector getCodes() {
Vector res = new Vector<>();