From bd705813e994dc316e698757655ee89eb8b77c99 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 11 Jan 2025 14:26:24 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                                 |  6 ++++++
 properties                                          |  3 ++-
 src/_VisualDVM/GlobalData/Settings/SettingName.java |  3 ---
 .../GlobalData/Settings/SettingsDBTable.java        |  1 -
 src/_VisualDVM/GlobalProperties.java                |  6 ++++++
 src/_VisualDVM/Passes/All/UpdateProperty.java       | 13 +++++++++++++
 src/_VisualDVM/Passes/All/UpdateSetting.java        |  8 --------
 .../Passes/Sapfor/OpenSapforVersionPass.java        |  2 +-
 src/_VisualDVM/Repository/Component/Visualiser.java |  7 +++----
 .../VisualiserSettingsMenu.java                     |  2 +-
 10 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c4532cca..af1762bf 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,8 +9,14 @@
     <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/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/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.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/VisualiserSettingsMenu/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 08ea5f45..87694238 100644
--- a/properties
+++ b/properties
@@ -15,6 +15,7 @@
   "collapseFileMessages": false,
   "collapseProjectTrees": false,
   "BackupWorkspace": "_sapfor_x64_backups",
+  "Workspace": "E:\\Workspace",
   "BackupHour": 5,
   "BackupMinute": 0,
   "EmailAdminsOnStart": false,
@@ -48,5 +49,5 @@
   "FortranWrapsOn": false,
   "ExtensionsOn": false,
   "ComparsionDiffMergeOn": true,
-  "BugReportsAgeLimit": 3
+  "BugReportsAgeLimit": 4
 }
\ No newline at end of file
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingName.java b/src/_VisualDVM/GlobalData/Settings/SettingName.java
index 8328b86a..354033b9 100644
--- a/src/_VisualDVM/GlobalData/Settings/SettingName.java
+++ b/src/_VisualDVM/GlobalData/Settings/SettingName.java
@@ -8,7 +8,6 @@ public enum SettingName {
     //--------------
     FastAccessPassesCount,
     LastOpenedProjectsCount,
-    Workspace,
     ShowFullArraysDeclarations,
     ShowFullTabsNames,
     LocalMakePathWindows,
@@ -65,8 +64,6 @@ public enum SettingName {
                 return "Показывать полные имена вкладок";
             case ShowFullArraysDeclarations:
                 return "Показывать развернутый список объявлений массивов";
-            case Workspace:
-                return "Рабочее пространство визуализатора";
             case STATIC_SHADOW_ANALYSIS:
                 return "Оптимизация теневых обменов";
             case STATIC_PRIVATE_ANALYSIS:
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
index 601fee7d..34286448 100644
--- a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
+++ b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
@@ -36,7 +36,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
         AddSetting(new DBSetting(SettingName.ShowFullTabsNames, 0, SettingType.SapforFlag, ComponentType.Visualiser));
         AddSetting(new DBSetting(SettingName.FastAccessPassesCount, 5, SettingType.IntField, ComponentType.Visualiser));
         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));
         if (Utils_.isWindows())
             AddSetting(new DBSetting(SettingName.LocalMakePathWindows, "C:\\MinGW\\msys\\1.0\\bin\\make.exe", SettingType.StringField, ComponentType.Visualiser));
diff --git a/src/_VisualDVM/GlobalProperties.java b/src/_VisualDVM/GlobalProperties.java
index 2b0e214d..ebb24615 100644
--- a/src/_VisualDVM/GlobalProperties.java
+++ b/src/_VisualDVM/GlobalProperties.java
@@ -48,6 +48,8 @@ public class GlobalProperties {
     @Expose
     public String BackupWorkspace = "_sapfor_x64_backups";
     @Expose
+    public String Workspace ="";
+    @Expose
     public int BackupHour = 5;
     @Expose
     public int BackupMinute = 0;
@@ -167,6 +169,8 @@ public class GlobalProperties {
     //-----------------
     public String getFieldDescription(String fieldName) {
         switch (fieldName) {
+            case "Workspace":
+                return "Рабочее пространство визуализатора";
             case "BugReportsAgeLimit":
                 return "Срок хранения отчетов об ошибках (месяцы)";
             case "ExtensionsOn":
@@ -251,6 +255,7 @@ public class GlobalProperties {
         }
         return false;
     }
+    //выкинуть(?)
     public void switchAndUpdateFlag(String name) {
         try {
             Field field = getClass().getField(name);
@@ -268,6 +273,7 @@ public class GlobalProperties {
         return Paths.get(System.getProperty("user.dir"), "properties").toFile();
     }
     //-----------------
+    //выкинуть.
     public void addFlagMenuItem(JMenu menu, String fieldName) {
         JMenuItem menu_item = new StableMenuItem(getFieldDescription(fieldName),
                 getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png");
diff --git a/src/_VisualDVM/Passes/All/UpdateProperty.java b/src/_VisualDVM/Passes/All/UpdateProperty.java
index be2fe725..57e91476 100644
--- a/src/_VisualDVM/Passes/All/UpdateProperty.java
+++ b/src/_VisualDVM/Passes/All/UpdateProperty.java
@@ -1,10 +1,13 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
 import Common.Visual.Windows.Dialog.SliderNumberForm;
+import Common.Visual.Windows.Dialog.VDirectoryChooser;
+import Common.Visual.Windows.Dialog.VFileChooser;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalProperties;
 import _VisualDVM.Passes.PassCode;
 
+import java.io.File;
 import java.lang.reflect.Field;
 public class UpdateProperty extends Pass<Object> {
     //todo в дальнейшем, все настройки перевести в properties, и перенести сюда функционал UpdateSetting (?)
@@ -20,6 +23,8 @@ public class UpdateProperty extends Pass<Object> {
         oldValue = field.get(Global.properties);
         newValue = null;
         SliderNumberForm sliderNumberForm = new SliderNumberForm();
+        VDirectoryChooser directoryChooser = new VDirectoryChooser("");
+        VFileChooser fileChooser = new VFileChooser("", "exe");
         //-
         if (args.length==1){
             switch (name){
@@ -27,6 +32,14 @@ public class UpdateProperty extends Pass<Object> {
                     if (sliderNumberForm.ShowDialog(description, oldValue, 1, 12))
                        newValue=sliderNumberForm.Result;
                     break;
+                case "Workspace":
+                    directoryChooser.setTitle(description);
+                    directoryChooser.SetCurrentDirectory(
+                            Global.properties.Workspace.isEmpty() ? Global.ProjectsDirectory : new File(Global.properties.Workspace));
+                    File dir = directoryChooser.ShowDialog();
+                    if (dir != null)
+                        newValue = dir.getAbsolutePath();
+                    break;
             }
         }else
             newValue = args[1];
diff --git a/src/_VisualDVM/Passes/All/UpdateSetting.java b/src/_VisualDVM/Passes/All/UpdateSetting.java
index b6f23a45..37369f3a 100644
--- a/src/_VisualDVM/Passes/All/UpdateSetting.java
+++ b/src/_VisualDVM/Passes/All/UpdateSetting.java
@@ -31,14 +31,6 @@ public class UpdateSetting extends Pass<DBSetting> {
                     break;
                 case StringField:
                     switch (target.Name) {
-                        case Workspace:
-                            directoryChooser.setTitle(target.Name.getDescription());
-                            directoryChooser.SetCurrentDirectory(
-                                    target.Value.isEmpty() ? Global.ProjectsDirectory : new File(target.Value));
-                            File dir = directoryChooser.ShowDialog();
-                            if (dir != null)
-                                NewValue = dir.getAbsolutePath();
-                            break;
                         case LocalMakePathWindows:
                             fileChooser.setTitle(target.Name.getDescription());
                             File file = fileChooser.ShowDialog();
diff --git a/src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java b/src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java
index b8cd51a5..d9ad215b 100644
--- a/src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java
+++ b/src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java
@@ -36,7 +36,7 @@ public abstract class OpenSapforVersionPass extends Pass<SapforVersion_json> {
     protected void body() throws Exception {
         SapforTask task = target.task;
         ShowMessage1("Построение дерева версий и создание баз данных...");
-        File rootHome = Paths.get((Global.mainModule.getDb()).settings.get(SettingName.Workspace).Value,
+        File rootHome = Paths.get(Global.properties.Workspace,
                 Utils_.getDateName(task.test_description)).toFile();
         for (SapforVersion_json version_json : task.versions) {
             ShowMessage2(version_json.version);
diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java
index 91da6824..deaa69e2 100644
--- a/src/_VisualDVM/Repository/Component/Visualiser.java
+++ b/src/_VisualDVM/Repository/Component/Visualiser.java
@@ -73,13 +73,12 @@ public class Visualiser extends Component {
         System.exit(0);
     }
     public File getWorkspace() {
-        if (!(Global.mainModule.getDb()).settings.get(SettingName.Workspace).toString().isEmpty()) {
-            File workspace = new File(Global.mainModule.getDb().settings.get(SettingName.Workspace).toString());
+        if (!Global.properties.Workspace.isEmpty()) {
+            File workspace = new File(Global.properties.Workspace);
             if (workspace.exists())
                 return workspace;
             else
-                Global.mainModule.getPass(PassCode.UpdateSetting).Do(
-                        SettingName.Workspace, "");
+                Global.mainModule.getPass(PassCode.UpdateProperty).Do("Workspace", "");
         }
         return Global.ProjectsDirectory;
     }
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
index a005fcb9..22ffb0af 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
@@ -29,7 +29,7 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
         }
         add(new SynchronizationSettingsMenu());
         add(new VersionsComparisonMenu());
-        add((Global.mainModule.getDb()).settings.get(SettingName.Workspace).getMenuItem());
+        add(Global.properties.getMenuItem("Workspace"));
         add(Global.properties.getMenuItem("BugReportsAgeLimit"));
     }
 }