From 6372fce1ac4e2d465216bd67a70fdb3953d353c4 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 2 Oct 2023 19:11:24 +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=BB=D0=B8=D0=BA?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=B4=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=B2?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=BE=D1=81=D0=B8=D0=BF=D0=B5=D0=B4=20=D1=81=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BF=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D0=BF=D0=B0=D0=BF=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  5 ++++-
 src/Common/Utils/Utils.java                   | 20 -------------------
 .../Passes/All/StartSapforTests.java          |  2 +-
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 95ff32b5..6b2732ad 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,10 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="" />
+    <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/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/src/Common/Utils/Utils.java b/src/Common/Utils/Utils.java
index 8b28d3e9..636ba997 100644
--- a/src/Common/Utils/Utils.java
+++ b/src/Common/Utils/Utils.java
@@ -1036,25 +1036,5 @@ public class Utils {
         }
         return false;
     }
-    public static void copyDirectory(File src, File dst) throws Exception {
-        int code = Constants.Nan;
-        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) {
-            ex.printStackTrace();
-            throw new PassException("Команда " + command + " завершилась с исключением.");
-        }
-        if (code != 0)
-            throw new PassException("Команда " + command + " завершилась с кодом " + code);
-    }
 }
 
diff --git a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
index a4e7e48f..89672110 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
@@ -266,7 +266,7 @@ public class StartSapforTests extends Pass_2021<SapforScenario> {
                     File taskWorkspace = new File(sapforTasksPackage.workspace, test.description);
                     Utils.CheckAndCleanDirectory(taskWorkspace);
                     //--
-                    Utils.copyDirectory(new File(Global.TestsDirectory, test.id), taskWorkspace);
+                    FileUtils.copyDirectory(new File(Global.TestsDirectory, test.id), taskWorkspace);
                 }
             }
             Global.db.Update(sapforTasksPackage);