From 9c6198656f1a87635ed0c30529de6598bacdce05 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 11 Jan 2025 17:43:27 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B4=D0=BE=D0=BB=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=D0=B0=20=D0=BD=D0=B0=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA.=20=D0=BF=D0=BE=D0=BF=D1=83=D1=82?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=BD=D0=B0=D1=88=D0=B5=D0=BB=20=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=BE=D0=B9=20=D0=B1=D0=B0=D0=B3?=
 =?UTF-8?q?=20=D1=81=20=D0=B7=D0=B0=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D0=B5?=
 =?UTF-8?q?=D0=BC=20=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B3=D0=BE=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                   | 11 +++++++++++
 properties                                            |  1 +
 src/_VisualDVM/GlobalData/Settings/SettingName.java   |  1 -
 .../GlobalData/Settings/SettingsDBTable.java          |  1 -
 src/_VisualDVM/GlobalProperties.java                  |  2 ++
 .../Passes/All/CreateGroupFromDirectory.java          |  2 +-
 src/_VisualDVM/Passes/All/CreateGroupFromFiles.java   |  2 +-
 .../Passes/All/CreateTestFromDirectory.java           |  2 +-
 src/_VisualDVM/Passes/All/CreateTestsFromFiles.java   |  2 +-
 src/_VisualDVM/Passes/All/OpenCurrentProject.java     |  2 +-
 src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java  |  2 +-
 src/_VisualDVM/Utils.java                             |  3 +--
 src/_VisualDVM/Visual/MainUI.java                     |  4 ++--
 13 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ac741825..b84b6f23 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,18 @@
   <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/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/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenCurrentProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 87694238..92f45e8a 100644
--- a/properties
+++ b/properties
@@ -16,6 +16,7 @@
   "collapseProjectTrees": false,
   "BackupWorkspace": "_sapfor_x64_backups",
   "Workspace": "E:\\Workspace",
+  "ProjectsSearchDirectory": "E:\\Workspace",
   "BackupHour": 5,
   "BackupMinute": 0,
   "EmailAdminsOnStart": false,
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingName.java b/src/_VisualDVM/GlobalData/Settings/SettingName.java
index f3b998b8..5a4338dc 100644
--- a/src/_VisualDVM/GlobalData/Settings/SettingName.java
+++ b/src/_VisualDVM/GlobalData/Settings/SettingName.java
@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.Settings;
 public enum SettingName {
     Undefined,
     //--------------
-    ProjectsSearchDirectory,
     EditorFontSize,
     //--------------
     FastAccessPassesCount,
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
index 34286448..201f374f 100644
--- a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
+++ b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
@@ -30,7 +30,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
     public void AddAll() throws Exception {
         //проверка списка всех настроек.
         //<editor-fold desc="Global">
-        AddSetting(new DBSetting(SettingName.ProjectsSearchDirectory, "", SettingType.StringField, ComponentType.Visualiser, false));
         AddSetting(new DBSetting(SettingName.EditorFontSize, "14", SettingType.StringField, ComponentType.Visualiser, false));
         AddSetting(new DBSetting(SettingName.ShowFullArraysDeclarations, 0, SettingType.SapforFlag, ComponentType.Visualiser));
         AddSetting(new DBSetting(SettingName.ShowFullTabsNames, 0, SettingType.SapforFlag, ComponentType.Visualiser));
diff --git a/src/_VisualDVM/GlobalProperties.java b/src/_VisualDVM/GlobalProperties.java
index ebb24615..ac24962f 100644
--- a/src/_VisualDVM/GlobalProperties.java
+++ b/src/_VisualDVM/GlobalProperties.java
@@ -50,6 +50,8 @@ public class GlobalProperties {
     @Expose
     public String Workspace ="";
     @Expose
+    public String ProjectsSearchDirectory="";
+    @Expose
     public int BackupHour = 5;
     @Expose
     public int BackupMinute = 0;
diff --git a/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java b/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java
index a0b76f5e..ff7d0445 100644
--- a/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java
+++ b/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java
@@ -62,7 +62,7 @@ public class CreateGroupFromDirectory extends PublishTests {
         } else return false;
         //---------------
         Vector<File> files = new Vector<>(Arrays.asList(files_));
-        Global.mainModule.getPass(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, directoryChooser.getCurrentDirectory());
+        Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", directoryChooser.getCurrentDirectory());
         return super.canStart(files, group);
     }
 }
diff --git a/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java b/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java
index 1ecaa234..efabb8cc 100644
--- a/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java
+++ b/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java
@@ -30,7 +30,7 @@ public class CreateGroupFromFiles extends PublishTests {
             return false;
         }
         File dir = fileChooser.getCurrentDirectory();
-        Global.mainModule.getPass(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir);
+        Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", dir);
         //---------------
         if (dir.getName().equals(Constants.data)) {
             Log.Writeln_(Utils_.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
diff --git a/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java b/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
index 18e9ccdb..f1ccac98 100644
--- a/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
+++ b/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
@@ -39,7 +39,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
     }
     //--
     void saveDirectory() {
-        Global.mainModule.getPass(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory,
+        Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory",
                 (dir.getParentFile() == null) ? dir.getAbsolutePath() : dir.getParent()
         );
     }
diff --git a/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java b/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java
index ace18174..c67a2ad1 100644
--- a/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java
+++ b/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java
@@ -26,7 +26,7 @@ public class CreateTestsFromFiles extends PublishTests {
                 Log.Writeln_("Не выбрано ни одного файла.");
                 return false;
             }
-            Global.mainModule.getPass(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, fileChooser.getCurrentDirectory());
+            Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", fileChooser.getCurrentDirectory());
             return super.canStart(files, Global.testingServer.db.groups.getUI().getCurrent());
         }
         return false;
diff --git a/src/_VisualDVM/Passes/All/OpenCurrentProject.java b/src/_VisualDVM/Passes/All/OpenCurrentProject.java
index d2c88081..0972d3e8 100644
--- a/src/_VisualDVM/Passes/All/OpenCurrentProject.java
+++ b/src/_VisualDVM/Passes/All/OpenCurrentProject.java
@@ -107,7 +107,7 @@ public class OpenCurrentProject extends Pass<db_project_info> {
         Global.mainModule.set(Current.ProjectView, ProjectView.Files);
         if (root_changes)
             Global.mainModule.set(Current.Root, new_root);
-        Global.mainModule.getPass(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir.getParent());
+        Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", dir.getParent());
         Global.mainModule.getPass(PassCode.UpdateSetting).Do(
                 SettingName.FREE_FORM, target.style.equals(LanguageStyle.free) ? "1" : "0")
         ;
diff --git a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
index 57415862..e26dc94c 100644
--- a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
+++ b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
@@ -41,7 +41,7 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
         //---------------------------------------------------------------
         //--
         File dir = fileChooser.getCurrentDirectory();
-        Global.mainModule.getPass(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir);
+        Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", dir);
         //---------------
         if (dir.getName().equals(Constants.data)) {
             Log.Writeln_(Utils_.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
diff --git a/src/_VisualDVM/Utils.java b/src/_VisualDVM/Utils.java
index 648245b4..ebc16e40 100644
--- a/src/_VisualDVM/Utils.java
+++ b/src/_VisualDVM/Utils.java
@@ -599,8 +599,7 @@ public class Utils {
         return res;
     }
     public static void RestoreSelectedDirectory(VFileChooser_ directoryChooser) {
-        String last_dir_home =
-                (Global.mainModule.getDb()).settings.get(SettingName.ProjectsSearchDirectory).Value;
+        String last_dir_home = Global.properties.ProjectsSearchDirectory;
         if (!last_dir_home.isEmpty())
             directoryChooser.SetCurrentDirectory(last_dir_home);
     }
diff --git a/src/_VisualDVM/Visual/MainUI.java b/src/_VisualDVM/Visual/MainUI.java
index df87fba3..93fd30b4 100644
--- a/src/_VisualDVM/Visual/MainUI.java
+++ b/src/_VisualDVM/Visual/MainUI.java
@@ -64,8 +64,8 @@ public class MainUI extends UIModule_ {
         return debugWindow;
     }
     public void HideSearchForm() {
-        if (searchReplaceWindow.isVisible())
-            searchReplaceWindow.setVisible(false);
+        if (getSearchReplaceWindow().isVisible())
+            getSearchReplaceWindow().setVisible(false);
     }
     public VersionsWindow getVersionsWindow() {
         return versionsWindow;