From 39f5b99adee0cf82d4172dbab84d255447eafc0d Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 4 Mar 2025 17:11:17 +0300
Subject: [PATCH] =?UTF-8?q?v++=20=D0=97=D0=B0=D1=87=D0=B8=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=20=D1=83=D1=81=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88=D0=B8?=
 =?UTF-8?q?=D1=85=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20=D0=B2=20=D0=91=D0=94?=
 =?UTF-8?q?=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                        | 7 +++----
 src/_VisualDVM/Constants.java                              | 2 +-
 src/_VisualDVM/TestingSystem/Common/Settings/Settings.java | 7 -------
 .../TestingSystem/DVM/DVMSettings/DVMSettings.java         | 3 ---
 .../SAPFOR/SapforSettings/SapforSettings.java              | 4 ++++
 5 files changed, 8 insertions(+), 15 deletions(-)

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 @@
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMSettingsCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMSettingsCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
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<PassCode> getCodes() {
         Vector<PassCode> res = new Vector<>();