From cad6ea8d3b8a7539abaa3da32c07aba7c72e88af Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 27 Mar 2024 00:28:04 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=B0=20=D1=81=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B1=D0=B5=D0=BB=D0=B0=D0=BC=D0=B8.=20v++?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                           | 4 ++++
 properties                                                    | 2 +-
 .../Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java  | 2 +-
 src/Repository/Component/Visualiser.java                      | 2 +-
 src/TestingSystem/Common/TestingPlanner.java                  | 3 +--
 src/TestingSystem/DVM/UserConnection.java                     | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4c11f3cb..445cc032 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,6 +8,10 @@
   <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/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 7e97f998..14b2caef 100644
--- a/properties
+++ b/properties
@@ -13,7 +13,7 @@
   "collapseCredentials": false,
   "collapseFileGraphs": true,
   "collapseFileMessages": true,
-  "collapseProjectTrees": true,
+  "collapseProjectTrees": false,
   "BackupWorkspace": "_sapfor_x64_backups",
   "BackupHour": 5,
   "BackupMinute": 0,
diff --git a/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java b/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
index e2b689b8..d9f5df27 100644
--- a/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
@@ -1,4 +1,5 @@
 package GlobalData.Tasks.Supervisor.Remote;
+import Common.UI.UI;
 import Common.Utils.Utils;
 import GlobalData.Makefile.Makefile;
 import GlobalData.RemoteFile.RemoteFile;
@@ -29,7 +30,6 @@ public class RemoteCompilationSupervisor extends RemoteTaskSupervisor<Compilatio
     }
     @Override
     protected void StartTask() throws Exception {
-        //UI.Info("starting task");
         pass.user.connection.performScript(getRemoteProject(), getStartCommand()+" 1>PID");
         RemoteFile PID = getPID();
         while (!pass.user.connection.Exists(PID)){
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 32aaa7c7..48742378 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1084;
+        version = 1085;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/TestingSystem/Common/TestingPlanner.java b/src/TestingSystem/Common/TestingPlanner.java
index 5a5b9d60..19aa7892 100644
--- a/src/TestingSystem/Common/TestingPlanner.java
+++ b/src/TestingSystem/Common/TestingPlanner.java
@@ -150,8 +150,7 @@ public abstract class TestingPlanner<P extends TestingPackage> {
                         Print("package " + testingPackage.id + " NEEDS TO KILL");
                         Kill();
                         UpdatePackageState(TasksPackageState.Aborted);
-                        ServerCommand(ServerCode.DeleteObjectByPK,
-                                new Pair(TestingPackageToKill.class, ptk_id));
+                        ServerCommand(ServerCode.DeleteObjectByPK, new Pair(TestingPackageToKill.class, ptk_id));
                     } else {
                         Session();
                     }
diff --git a/src/TestingSystem/DVM/UserConnection.java b/src/TestingSystem/DVM/UserConnection.java
index c217de75..3c9aaff8 100644
--- a/src/TestingSystem/DVM/UserConnection.java
+++ b/src/TestingSystem/DVM/UserConnection.java
@@ -237,7 +237,7 @@ public class UserConnection {
         //--
         writeToFile("cd " + Utils.DQuotes(directory.full_name) + "\n" + String.join("\n", commands), script_file);
         //--
-        ShellCommand(script_file.full_name + " 1>" + Utils.DQuotes(out.full_name) + " 2>" + Utils.DQuotes(err.full_name));
+        ShellCommand(Utils.DQuotes(script_file.full_name) + " 1>" + Utils.DQuotes(out.full_name) + " 2>" + Utils.DQuotes(err.full_name));
         return new Pair<>(out, err);
     }
     public void putResource(RemoteFile dstDirectory, String resource_name) throws Exception {