From 809b1f8d145529163905d2c69638b3a1b1df7e33 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 25 Mar 2025 14:46:32 +0300
Subject: [PATCH] =?UTF-8?q?++=20=D0=B7=D0=B0=D0=B2=D0=B5=D1=80=D1=88=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=B8=D0=B7=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BE=D1=82=20=20=D0=B4=D0=B6=D1=81=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                    |  8 +-------
 src/_VisualDVM/Constants.java                          |  4 ++--
 src/_VisualDVM/TestingSystem/Common/TestsDatabase.java | 10 ++++------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3fb69734..bcedc922 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,14 +8,8 @@
   <component name="ChangeListManager">
     <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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionJson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsJson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsSetJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsSetJson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" 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/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.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/DVM/DVMSettings/UI/DVMSettingsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.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 fe393ed6..aac5f458 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1225;
+    public static final int version = 1226;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
@@ -48,7 +48,7 @@ public class Constants {
     //
     //7998 отладочный порт. теперь.
     public static final int ComponentsServerPort = 7995; //7795
-    public static final int TestingServerPort = 7998;    //7996
+    public static final int TestingServerPort = 7996;    //7996
     public static final int SocketTimeout = 0;
     //-
     public static final String ServerAddress = "alex-freenas.ddns.net";
diff --git a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
index b8ebb6c3..d5290b9c 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
@@ -657,7 +657,7 @@ public class TestsDatabase extends SQLiteDatabase {
     //--
     public void Patch() throws Exception {
         /*
-        Vector<DVMCompilationOptionsSet> sets = new Vector<>();
+        Vector<DVMCompilationOptionsSet> sets1 = new Vector<>();
         for (DVMSettings dvm_settings : dvmSettings.Data.values()) {
             OptionsSetJson optionsSetJson = Utils_.gson.fromJson(dvm_settings.packedCompilationOptionsJson, OptionsSetJson.class);
             for (OptionsJson optionsJson : optionsSetJson.values) {
@@ -666,11 +666,11 @@ public class TestsDatabase extends SQLiteDatabase {
                 for (OptionJson optionJson : optionsJson.values) {
                     set.options.add(new DVMCompilationOption(optionJson.name, optionJson.value));
                 }
-                sets.add(set);
+                sets1.add(set);
             }
         }
         BeginTransaction();
-        for (DVMCompilationOptionsSet set : sets) {
+        for (DVMCompilationOptionsSet set : sets1) {
             Insert(set);
 
             for (DVMCompilationOption option : set.options) {
@@ -679,8 +679,6 @@ public class TestsDatabase extends SQLiteDatabase {
             }
         }
         Commit();
-         */
-        /*
         Vector<DVMEnvironmentsSet> sets = new Vector<>();
         for (DVMSettings dvm_settings : dvmSettings.Data.values()) {
             EnvironmentsSetJson environmentsSetJson = Utils_.gson.fromJson(dvm_settings.packedRunEnvironmentValuesJson, EnvironmentsSetJson.class);
@@ -702,7 +700,7 @@ public class TestsDatabase extends SQLiteDatabase {
             }
         }
         Commit();
-        */
+         */
     }
     public static String printOptionsLine(Vector<DVMCompilationOption> options) {
         Vector<String> res = new Vector<>();