From 9bc35c0ca6fedaa3949922fc969a9d0ed78e6733 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 10 Jan 2025 21:03:06 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D0=BF=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B2=D0=BE=D0=B4=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B5=D0=BA=20=D1=81=D0=B8=D0=BD=D1=85=D1=80=D0=BE=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B2=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D1=82=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                | 14 ++++----------
 properties                                         |  2 ++
 src/_VisualDVM/Global.java                         |  7 +++----
 .../GlobalData/Settings/SettingName.java           | 13 +++++--------
 .../GlobalData/Settings/SettingsDBTable.java       |  4 ----
 src/_VisualDVM/GlobalProperties.java               | 10 ++++++++--
 .../MainMenuBar/SynchronizationSettingsMenu.java   |  6 +++---
 7 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bd4ff137..3d4583bd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,17 +8,11 @@
   <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$/PerformanceAnalyzer/1049392283/stat.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/PerformanceAnalyzer/139606632/stat.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/PerformanceAnalyzer/1664247100/stat.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/PerformanceAnalyzer/535943622/stat.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/PerformanceAnalyzer/622828792/stat.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index ba03b948..a8e0f499 100644
--- a/properties
+++ b/properties
@@ -19,6 +19,8 @@
   "BackupMinute": 0,
   "EmailAdminsOnStart": false,
   "AutoUpdateSearch": true,
+  "AutoBugReportsLoad": true,
+  "AutoTestsLoad": true,
   "ConfirmPassesStart": true,
   "ShowPassesDone": true,
   "FocusPassesResult": true,
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index 0ea1b43f..cd41dba7 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -235,13 +235,12 @@ public class Global {
         //---------------
         componentsServer.ActivateDB();
         testingServer.ActivateDB();
-        //в проперти их!
         //-- чисто чтобы создать таблицы. соединения на стороне клиента не предвидится.
-        if (mainModule.getDb().settings.get(SettingName.AutoBugReportsLoad).toBoolean())
+        if (Global.properties.AutoBugReportsLoad)
             Global.mainModule.getPass(PassCode.SynchronizeBugReports).Do();
-        //--
-        if (mainModule.getDb().settings.get(SettingName.AutoTestsLoad).toBoolean())
+        if (Global.properties.AutoTestsLoad)
             Global.mainModule.getPass(PassCode.SynchronizeTests).Do();
+        //--
         Global.mainModule.getSapfor().refreshPid(); //без сапфора сюда это все равно не дойдет.
         Global.mainModule.getUI().getMainWindow().Show();
     }
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingName.java b/src/_VisualDVM/GlobalData/Settings/SettingName.java
index 274d1ee1..1a77bd7b 100644
--- a/src/_VisualDVM/GlobalData/Settings/SettingName.java
+++ b/src/_VisualDVM/GlobalData/Settings/SettingName.java
@@ -3,6 +3,7 @@ public enum SettingName {
     Undefined,
     //
     //совместимость
+    /*
     ConfirmPassesStart,
     ShowPassesDone,
     FocusPassesResult,
@@ -10,13 +11,15 @@ public enum SettingName {
     AutoSubscribeTest,
     VersionsMultiSelection,
     FilesMultiSelection,
+    AutoBugReportsLoad,
+     AutoTestsLoad,
+     */
     //----------------------------------
     ProjectsSearchDirectory,
     LastVersionPath,
     EditorFontSize,
     //---------------------------------
-    AutoBugReportsLoad,
-    AutoTestsLoad,
+
     //-
     AutoSynchronizeRecipients,
     FastAccessPassesCount,
@@ -113,10 +116,6 @@ public enum SettingName {
                 return "Учитывать регистр";
             case Workspace:
                 return "Рабочее пространство визуализатора";
-            case AutoBugReportsLoad:
-                return "Автоматическая синхронизация отчётов об ошибках";
-            case AutoTestsLoad:
-                return "Автоматическая синхронизация системы тестирования";
             case STATIC_SHADOW_ANALYSIS:
                 return "Оптимизация теневых обменов";
             case STATIC_PRIVATE_ANALYSIS:
@@ -151,8 +150,6 @@ public enum SettingName {
                 return "Сохранять SPF директивы при преобразованиях";
             case PARSE_FOR_INLINE:
                 return "Синтаксический анализ для подстановки";
-            case AutoSubscribeTest:
-                return "Автоматическая проверка подписки";
             case AutoSynchronizeRecipients:
                 return "Автоматическое извлечение адресатов";
             case FastAccessPassesCount:
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
index 44959a25..3f4d4588 100644
--- a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
+++ b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
@@ -39,13 +39,9 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
         AddSetting(new DBSetting(SettingName.LastOpenedProjectsCount, 5, SettingType.IntField, ComponentType.Visualiser));
         AddSetting(new DBSetting(SettingName.Workspace, "", SettingType.StringField, ComponentType.Visualiser));
         AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
-        AddSetting(new DBSetting(SettingName.AutoBugReportsLoad, 0, SettingType.SapforFlag, ComponentType.Visualiser, true));
-        AddSetting(new DBSetting(SettingName.AutoTestsLoad, 0, SettingType.SapforFlag, ComponentType.Visualiser, true));
         if (Utils_.isWindows())
             AddSetting(new DBSetting(SettingName.LocalMakePathWindows, "C:\\MinGW\\msys\\1.0\\bin\\make.exe", SettingType.StringField, ComponentType.Visualiser));
         AddSetting(new DBSetting(SettingName.SmallScreen, 0, SettingType.SapforFlag, ComponentType.Visualiser));
-        //совместимость. указываем явно чтобы не были видны в меню.
-        AddSetting(new DBSetting(SettingName.AutoSubscribeTest, 0, SettingType.SapforFlag, ComponentType.Visualiser, false));
         //</editor-fold>
         //--
         //<editor-fold desc="Sapfor">
diff --git a/src/_VisualDVM/GlobalProperties.java b/src/_VisualDVM/GlobalProperties.java
index 97138198..782788d7 100644
--- a/src/_VisualDVM/GlobalProperties.java
+++ b/src/_VisualDVM/GlobalProperties.java
@@ -51,6 +51,10 @@ public class GlobalProperties {
     @Expose
     public boolean AutoUpdateSearch = true;
     @Expose
+    public boolean AutoBugReportsLoad = true;
+    @Expose
+    public boolean AutoTestsLoad = true;
+    @Expose
     public boolean ConfirmPassesStart = true;
     @Expose
     public boolean ShowPassesDone = true;
@@ -86,14 +90,12 @@ public class GlobalProperties {
     public boolean EmailOnTestingProgress = false; //включено ли оповещение по email о результатах тестирования.
     @Expose
     public boolean eraseTestingWorkspaces = true; //удалять ли рабочее пространство пакетов тестирования после его завершения
-
     @Expose
     public int lastMachineId = CommonConstants.Nan;
     @Expose
     public int lastUserId = CommonConstants.Nan;
     @Expose
     public int lastCompilerId = CommonConstants.Nan;
-
     public GlobalProperties(GlobalProperties p) {
         super();
         Mode = p.Mode;
@@ -145,6 +147,10 @@ public class GlobalProperties {
     //-----------------
     public String getFieldDescription(String fieldName) {
         switch (fieldName) {
+            case "AutoBugReportsLoad":
+                return "Автоматическая синхронизация отчётов об ошибках";
+            case "AutoTestsLoad":
+                return "Автоматическая синхронизация системы тестирования";
             case "ShowPassesDone":
                 return "Сообщать об успешном выполнении проходов";
             case "ConfirmPassesStart":
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java
index e784757b..404d3251 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java
@@ -4,10 +4,10 @@ import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.Visual.Menus.SettingsSubmenu;
 public class SynchronizationSettingsMenu extends SettingsSubmenu {
     public SynchronizationSettingsMenu() {
-        super("Синхронизация", null,
-                SettingName.AutoBugReportsLoad,
-                SettingName.AutoTestsLoad);
+        super("Синхронизация", null);
         String[] propertiesNames = new String[]{
+                "AutoBugReportsLoad",
+                "AutoTestsLoad",
                 "AutoUpdateSearch",
         };
         for (String name : propertiesNames) {