From 49f0a56c4f0635c8609440eb35f1ef474bdfe126 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 20 Feb 2025 15:21:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=83=D1=82=D1=8C=20=D0=BA=20=D0=B4?=
 =?UTF-8?q?=D0=B2=D0=BC=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BE=D0=BD=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D1=82=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B2=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D1=81=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B2=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                   | 7 +------
 properties                                            | 2 +-
 src/_VisualDVM/ComponentsServer/ComponentsServer.java | 2 +-
 src/_VisualDVM/ComponentsServerProperties.java        | 2 ++
 src/_VisualDVM/Constants.java                         | 1 -
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b96057ff..800f55be 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,12 +7,7 @@
   </component>
   <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$/src/_VisualDVM/ComponentsServer/Recipient/RecipientsDataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/RecipientsDataSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java" 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/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeCredentials.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeCredentials.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServerProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServerProperties.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 413d441b..220a91e9 100644
--- a/properties
+++ b/properties
@@ -2,7 +2,7 @@
   "Email": "vmk-post@yandex.ru",
   "Name": "M",
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\BUG",
+  "ProjectsSearchDirectory": "E:\\BUG\\JAC",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
diff --git a/src/_VisualDVM/ComponentsServer/ComponentsServer.java b/src/_VisualDVM/ComponentsServer/ComponentsServer.java
index e361d556..6994c519 100644
--- a/src/_VisualDVM/ComponentsServer/ComponentsServer.java
+++ b/src/_VisualDVM/ComponentsServer/ComponentsServer.java
@@ -180,7 +180,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                 File program = Paths.get(project.getAbsolutePath(), fileName).toFile();
                 //--
                 File convertedProgram = Paths.get(program.getParent(), Utils_.getFileNameWithoutExtension(program) + ".DVMH." + (projectLanguage.equals(LanguageName.fortran) ? "f" : "c")).toFile();
-                String command = Utils_.DQuotes(Constants.server_dvm_drv) + " " + projectLanguage.getDVMCompile() + "dv " + options + " " + Utils_.DQuotes(program.getName());
+                String command = Utils_.DQuotes(Global.componentsServerProperties.default_dvm_drv) + " " + projectLanguage.getDVMCompile() + "dv " + options + " " + Utils_.DQuotes(program.getName());
                 //--
                 File fileWorkspace = program.getParentFile();
                 Process process = Utils.startScript(workspace, fileWorkspace, Utils_.getDateName("convert_script"), command);
diff --git a/src/_VisualDVM/ComponentsServerProperties.java b/src/_VisualDVM/ComponentsServerProperties.java
index 30b9b31e..baa3aa6e 100644
--- a/src/_VisualDVM/ComponentsServerProperties.java
+++ b/src/_VisualDVM/ComponentsServerProperties.java
@@ -14,6 +14,8 @@ public class ComponentsServerProperties extends VisualDVMProperties{
     public int BackupMinute = 0;
     @Expose
     public int ComponentsBackUpsCount = 10;
+    @Expose
+    public String default_dvm_drv="";
     //---
     public ComponentsServerProperties(){
         Mode = _VisualDVM.Mode.Server;
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index f8b26454..3349e0ef 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -96,7 +96,6 @@ public class Constants {
             "bad termination"
     };
     public final static String separator = "----------------------------------";
-    public static final String server_dvm_drv = "/home/DVM/dvm_current/dvm_sys/bin/dvm_drv";  //зависимость от путей. в настройки?
     //-------------------------------------------------------
     public static String[] resourses_names = new String[]{
             //--