From 8df00d49696be5ca8cdf1794eb75f061411d88ad Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 2 Oct 2023 17:58:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B0=D0=B3.=20=D0=B2=20=D0=BD=D0=B5?=
 =?UTF-8?q?=D1=81=D0=BA=D0=BE=D0=BB=D1=8C=D0=BA=D0=B8=D1=85=20=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=85=20=D0=BD=D0=B5=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=D1=8C=D0=BD=D0=BE=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8F=D0=BB=D0=BE=D1=81=D1=8C=20=D1=80=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=87=D0=B5=D0=B5=20=D0=BF=D1=80=D0=BE=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BD=D1=81=D1=82=D0=B2=D0=BE=20=D0=B2=D0=B8=D0=B7=D1=83?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=82=D0=BE=D1=80=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D0=BE=20=D1=83=D0=BC=D0=BE=D0=BB=D1=87=D0=B0=D0=BD=D0=B8=D1=8E?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                              |  3 ++-
 src/Common/Global.java                           |  2 --
 src/Common/Utils/Utils.java                      | 16 +++++++++++-----
 .../Passes/All/DeleteDownloadedBugReports.java   |  3 +--
 .../Passes/All/StartSapforTests.java             |  7 +++----
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 69f62c81..78671115 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,9 @@
   <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/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/Common/Global.java b/src/Common/Global.java
index 8854a7c4..d375a46e 100644
--- a/src/Common/Global.java
+++ b/src/Common/Global.java
@@ -88,7 +88,6 @@ public class Global {
     public static File PerformanceAnalyzerDirectory;
     public static File DataBackUpsDirectory;
     public static File PackagesDirectory;
-    public static File SapforPackagesDirectory;
     //------------------------------------------------------------------
     public static Visualiser visualiser = null;
     public static Visualizer_2 visualizer_2 = null;
@@ -127,7 +126,6 @@ public class Global {
         Utils.CheckDirectory(StsDirectory = Paths.get(Home, Sts).toFile());
         Utils.CheckDirectory(TestsDirectory = Paths.get(Home, Tests).toFile());
         Utils.CheckDirectory(PerformanceAnalyzerDirectory = Paths.get(Home, PerformanceAnalyzer).toFile());
-        Utils.CheckDirectory(SapforPackagesDirectory = Paths.get(Home, "SapforTasksPackages").toFile());
     }
     public static void CheckServerDirectories() {
         Utils.CheckDirectory(ComponentsDirectory = Paths.get(Home, components).toFile());
diff --git a/src/Common/Utils/Utils.java b/src/Common/Utils/Utils.java
index 82ad1aff..8b28d3e9 100644
--- a/src/Common/Utils/Utils.java
+++ b/src/Common/Utils/Utils.java
@@ -673,8 +673,8 @@ public class Utils {
                     for (String ext : extensions) {
                         if (file_extension.equalsIgnoreCase(ext)) {
                             res.add(file);
-                          //  System.out.println(file.getAbsolutePath() + ":" + Utils.Brackets(file_extension));
-                          //  System.out.println("MATCH");
+                            //  System.out.println(file.getAbsolutePath() + ":" + Utils.Brackets(file_extension));
+                            //  System.out.println("MATCH");
                         }
                     }
                 }
@@ -1038,9 +1038,15 @@ public class Utils {
     }
     public static void copyDirectory(File src, File dst) throws Exception {
         int code = Constants.Nan;
-        String command = "xcopy " +
-                Utils.DQuotes(src.getAbsolutePath()) + " " +
-                Utils.DQuotes(dst.getAbsolutePath()) + " /e";
+        String command =
+                Global.isWindows ?
+                        ("xcopy " +
+                                Utils.DQuotes(src.getAbsolutePath()) + " " +
+                                Utils.DQuotes(dst.getAbsolutePath()) + " /e")
+                        :
+                        ("cp -r " + Utils.DQuotes(src.getAbsolutePath()) + " " +
+                                Utils.DQuotes(dst.getAbsolutePath())
+                        );
         try {
             code = Runtime.getRuntime().exec(command).waitFor();
         } catch (Exception ex) {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java b/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
index 20cf032b..584b677d 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
@@ -3,7 +3,6 @@ import Common.Current;
 import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
-import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
@@ -22,7 +21,7 @@ public class DeleteDownloadedBugReports extends Pass_2021<Vector<File>> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = null;
-        File workspace = new File(Global.db.settings.get(SettingName.Workspace).toString());
+        File workspace = Global.visualiser.getWorkspace();
         File[] files = workspace.listFiles(pathname -> pathname.isDirectory() && pathname.getName().toLowerCase().startsWith("bugreport_"));
         if (files != null) {
             target = new Vector<>(Arrays.asList(files));
diff --git a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
index 77520d7c..a4e7e48f 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
@@ -4,7 +4,6 @@ import Common.Global;
 import Common.GlobalProperties;
 import Common.UI.UI;
 import Common.Utils.Utils;
-import GlobalData.Settings.SettingName;
 import ProjectData.LanguageName;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
@@ -213,7 +212,7 @@ public class StartSapforTests extends Pass_2021<SapforScenario> {
         target.tasksCount = allTasksCount;
         Global.db.Insert(target);
         //--->>>
-        File scenarioWorkspace = Paths.get(Global.db.settings.get(SettingName.Workspace).Value, String.valueOf(target.id)).toFile();
+        File scenarioWorkspace = new File(Global.visualiser.getWorkspace(), String.valueOf(target.id));
         Utils.CheckAndCleanDirectory(scenarioWorkspace);
         target.workspace = scenarioWorkspace.getAbsolutePath();
         target.testsNames = String.join(";", testsNames_lower);
@@ -249,10 +248,10 @@ public class StartSapforTests extends Pass_2021<SapforScenario> {
             sapforTasksPackage.sapforconfiguration_id = configuration.id;
             sapforTasksPackage.flags = SapforConfigurationInterface.getFlags(configuration);
             sapforTasksPackage.passesNames = String.join(";", passesNames);
-            //--
+            //--xcopy
             Global.db.Insert(sapforTasksPackage);
             sapforTasksPackage.workspace = Paths.get(
-                    Global.db.settings.get(SettingName.Workspace).Value,
+                    Global.visualiser.getWorkspace().getAbsolutePath(),
                     String.valueOf(target.id),
                     String.valueOf(sapforTasksPackage.id)
             ).toFile().getAbsolutePath();