From 8edb0ba16ba1b837478f740245204f9a37f48be4 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 20 Dec 2023 02:47:47 +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=D1=87=D0=B0=D1=81?=
 =?UTF-8?q?=D1=82=D0=B8=D1=87=D0=BD=D1=8B=D0=B9=20=D1=80=D0=B5=D1=84=D0=B0?=
 =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=20=D0=B8=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=86=D0=B8=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8.?=
 =?UTF-8?q?=20=D0=B5=D1=89=D0=B5=20=D0=BD=D0=B5=20=D0=B3=D0=BE=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  29 +++-
 .../RemoteFile/UI/RemoteFileChooser.java      |   2 +-
 .../Remote/RemoteTaskSupervisor.java          |   2 +-
 src/GlobalData/User/User.java                 |   2 +-
 src/TestingSystem/DVM/DVMTestingPlanner.java  |   2 +-
 .../Passes/All/ArchivesBackupPass.java        |   2 +-
 .../Passes/All/InstallServerSapfor.java       |   2 +-
 .../Passes/All/LocalInitaliseUser.java        |   2 +-
 .../Passes/All/RemoteInitialiseUser.java      | 128 +++++++++++-------
 .../Passes/SSH/ConnectionPass_2023.java       |  34 +++++
 .../Passes/SSH/CurrentConnectionPass.java     |   1 +
 .../Passes/SSH/TaskConnectionPass.java        |   1 +
 src/files/{Planner => }/Array.h               |   0
 .../{Planner => }/CompilationSupervisor.h     |   0
 src/files/{Planner => }/CompilationTask.h     |   0
 .../Passes/SSH => files}/ConnectionPass.java  |   4 +-
 src/files/{Planner => }/File.h                |   0
 src/files/{Planner => }/Global.h              |   0
 src/files/{Planner => }/Planner.cpp           |   0
 src/files/{Planner => }/RunSupervisor.h       |   0
 src/files/{Planner => }/RunTask.h             |   0
 src/files/{Planner => }/String.h              |   0
 src/files/{Planner => }/Supervisor.h          |   0
 src/files/{Planner => }/Task.h                |   0
 src/files/{Planner => }/Text.h                |   0
 src/files/{Planner => }/Utils.h               |   0
 src/files/{Planner => }/version.h             |   0
 27 files changed, 151 insertions(+), 60 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/SSH/ConnectionPass_2023.java
 rename src/files/{Planner => }/Array.h (100%)
 rename src/files/{Planner => }/CompilationSupervisor.h (100%)
 rename src/files/{Planner => }/CompilationTask.h (100%)
 rename src/{Visual_DVM_2021/Passes/SSH => files}/ConnectionPass.java (99%)
 rename src/files/{Planner => }/File.h (100%)
 rename src/files/{Planner => }/Global.h (100%)
 rename src/files/{Planner => }/Planner.cpp (100%)
 rename src/files/{Planner => }/RunSupervisor.h (100%)
 rename src/files/{Planner => }/RunTask.h (100%)
 rename src/files/{Planner => }/String.h (100%)
 rename src/files/{Planner => }/Supervisor.h (100%)
 rename src/files/{Planner => }/Task.h (100%)
 rename src/files/{Planner => }/Text.h (100%)
 rename src/files/{Planner => }/Utils.h (100%)
 rename src/files/{Planner => }/version.h (100%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bb9e9079..5121907a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,33 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/ConnectionPass_2023.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/User.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/ConnectionPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/Array.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Array.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/CompilationSupervisor.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/CompilationSupervisor.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/CompilationTask.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/CompilationTask.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/File.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/File.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/Global.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Global.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/Planner.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Planner.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/RunSupervisor.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/RunSupervisor.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/RunTask.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/RunTask.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/String.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/String.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/Supervisor.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Supervisor.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/Task.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Task.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/Text.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Text.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/Utils.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Utils.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/version.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/version.h" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -113,11 +138,11 @@
       <recent name="TestingSystem.TestingServer" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\Visual_DVM_2021\Passes\UI" />
       <recent name="E:\Visual_DVM_2020\src\Visual_DVM_2021\UI\Main" />
       <recent name="E:\Visual_DVM_2020\src\JAnalyzer" />
-      <recent name="E:\Visual_DVM_2020\resources" />
     </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="Visual_DVM_2021.Passes.UI" />
diff --git a/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java b/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
index ade860ad..d5b22ed4 100644
--- a/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
+++ b/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
@@ -4,7 +4,7 @@ import Common.Global;
 import Common.UI.UI;
 import Common.UI.Windows.Dialog.Dialog;
 import GlobalData.RemoteFile.RemoteFile;
-import Visual_DVM_2021.Passes.SSH.ConnectionPass;
+import files.ConnectionPass;
 import com.jcraft.jsch.ChannelSftp.LsEntry;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
index 87c01cb5..323923c3 100644
--- a/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
@@ -5,7 +5,7 @@ import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.Supervisor.TaskSupervisor;
 import GlobalData.Tasks.Task;
 import GlobalData.Tasks.TaskState;
-import Visual_DVM_2021.Passes.SSH.ConnectionPass;
+import files.ConnectionPass;
 public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSupervisor<T, ConnectionPass> {
     protected RemoteFile getRemoteProjectsPath() {
         return new RemoteFile(pass.user.getRemoteProjectsPath(), true);
diff --git a/src/GlobalData/User/User.java b/src/GlobalData/User/User.java
index a5c27c5a..4eb4e9ba 100644
--- a/src/GlobalData/User/User.java
+++ b/src/GlobalData/User/User.java
@@ -4,7 +4,7 @@ import Common.Current;
 import Common.Database.iDBObject;
 import GlobalData.Machine.Machine;
 import TestingSystem.DVM.UserConnection;
-import Visual_DVM_2021.Passes.SSH.ConnectionPass;
+import files.ConnectionPass;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.io.File;
diff --git a/src/TestingSystem/DVM/DVMTestingPlanner.java b/src/TestingSystem/DVM/DVMTestingPlanner.java
index d3cc34ad..9f186cfd 100644
--- a/src/TestingSystem/DVM/DVMTestingPlanner.java
+++ b/src/TestingSystem/DVM/DVMTestingPlanner.java
@@ -16,7 +16,7 @@ import TestingSystem.DVM.DVMTasks.DVMRunTask;
 import TestingSystem.DVM.DVMTasks.DVMTask;
 import TestingSystem.Common.TasksPackageState;
 import Visual_DVM_2021.Passes.All.UnzipFolderPass;
-import Visual_DVM_2021.Passes.SSH.ConnectionPass;
+import files.ConnectionPass;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 
diff --git a/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java b/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java
index d8d9b94c..79c94f5d 100644
--- a/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java
+++ b/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java
@@ -4,7 +4,7 @@ import Common.Utils.Utils;
 import GlobalData.Machine.Machine;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.User.User;
-import Visual_DVM_2021.Passes.SSH.ConnectionPass;
+import files.ConnectionPass;
 import com.jcraft.jsch.ChannelSftp;
 
 import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java b/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
index 5eb431fb..574b0dac 100644
--- a/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
+++ b/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
@@ -8,7 +8,7 @@ import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
 import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.SSH.ConnectionPass;
+import files.ConnectionPass;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 
 import java.util.Date;
diff --git a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java b/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
index e7ee20ea..4024c743 100644
--- a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
+++ b/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
@@ -5,7 +5,7 @@ import Common.Utils.Utils;
 import GlobalData.User.User;
 import GlobalData.User.UserState;
 import Visual_DVM_2021.Passes.ProcessPass;
-import Visual_DVM_2021.Passes.SSH.ConnectionPass;
+import files.ConnectionPass;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java b/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
index e4ff5fa4..f25dcdd3 100644
--- a/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
+++ b/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
@@ -2,68 +2,95 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
-import Visual_DVM_2021.Passes.SSH.CurrentConnectionPass;
+import Visual_DVM_2021.Passes.PassException;
+import Visual_DVM_2021.Passes.SSH.ConnectionPass_2023;
 
 import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-public class RemoteInitialiseUser extends CurrentConnectionPass<String> {
+import java.util.Vector;
+public class RemoteInitialiseUser extends ConnectionPass_2023<RemoteFile> {
+    RemoteFile modulesDirectory;
     @Override
-    protected boolean needsInitialize() {
-        return false;
+    protected boolean needsAnimation() {
+        return true;
+    }
+    @Override
+    protected boolean canStart(Object... args) {
+        return Current.Check(Log, Current.User);
+    }
+    @Override
+    protected void Connect() throws Exception {
+        machine = Current.getMachine();
+        user = Current.getUser();
+        super.Connect();
+    }
+    void put_resource(String res_name, RemoteFile dst_directory) throws Exception {
+        user.connection.putSingleFile(Utils.CreateTempResourceFile(res_name), new RemoteFile(dst_directory, res_name));
+    }
+    void compileModule(String module_name) throws Exception{
+        user.connection.performScript(modulesDirectory,
+                "g++ " +
+                Utils.DQuotes(module_name + ".cpp") + " -o "+ Utils.DQuotes(module_name));
+        RemoteFile binary = new RemoteFile(modulesDirectory, module_name);
+        if (!user.connection.Exists(binary)){
+            throw new PassException("Не удалось собрать модуль "+Utils.Brackets(module_name));
+        }else {
+            user.connection.sftpChannel.chmod(0777, binary.full_name);
+        }
     }
     @Override
     protected void ServerAction() throws Exception {
         String workspace_name = Utils.getDateName("visual_sapfor_workspace");
-        target = Utils.toU(Paths.get(sftpChannel.getHome(), workspace_name).toString());
-        ShowMessage1("Создание рабочих папок...");
+        ShowMessage1("Создание рабочего пространства...");
+        target = new RemoteFile(user.connection.sftpChannel.getHome(), workspace_name);
+        user.connection.sftpChannel.mkdir(target.full_name);
+        Vector<RemoteFile> subdirectories = new Vector<>();
+        subdirectories.add(new RemoteFile(target, "projects"));
+        subdirectories.add(modulesDirectory = new RemoteFile(target, "modules"));
+        subdirectories.add(new RemoteFile(target, "tests"));
         //-------------------------------------
-        sftpChannel.mkdir(target);
-        sftpChannel.cd(target);
-        sftpChannel.mkdir(projects);
-        sftpChannel.mkdir(modules);
-        sftpChannel.mkdir(compilers);
-        sftpChannel.mkdir(tests);
-        //------------------------------------
-        sftpChannel.cd(modules);
-        ShowMessage1("Закачка модулей...");
-        put_resource(launcher_code);
-        put_resource(starter_code);
-        put_resource(Process_r_header);
+        for (RemoteFile remoteFile : subdirectories)
+            user.connection.sftpChannel.mkdir(remoteFile.full_name);
         //----------------------------------
-        String [] planner_files = new String[]{
-          "Array.h",
-
-          "CompilationSupervisor.h",
-          "CompilationTask.h",
-
-          "File.h",
-          "Global.h",
-
-          "Planner.cpp",
-
-          "RunSupervisor.h",
-          "RunTask.h",
-
-          "String.h",
-          "Supervisor.h",
-
-          "Task.h",
-          "Text.h",
-          "Utils.h"
+        String[] resourses_names = new String[]{
+                //--
+                "Process_r.h",
+                "starter.cpp",
+                "launcher.cpp",
+                //--
+                "Array.h",
+                "CompilationSupervisor.h",
+                "CompilationTask.h",
+                "File.h",
+                "Global.h",
+                "Planner.cpp",
+                "RunSupervisor.h",
+                "RunTask.h",
+                "String.h",
+                "Supervisor.h",
+                "Task.h",
+                "Text.h",
+                "Utils.h"
         };
-        for (String p: planner_files){
-            File local_p = Utils.getTempFileName(p);
-            URL u = Utils.class.getResource("/files/Planner/" + p);
-            InputStream i = u.openStream();
-            Files.copy(i, local_p.toPath(), StandardCopyOption.REPLACE_EXISTING);
-            putSingleFile(local_p.getAbsolutePath(), p);
+        ShowMessage1("Закачка модулей...");
+        for (String resource_name : resourses_names) {
+            ShowMessage2(resource_name);
+            File src = Utils.CreateTempResourceFile(resource_name);
+            RemoteFile dst = new RemoteFile(modulesDirectory, resource_name);
+            user.connection.putSingleFile(src, dst);
         }
         //-------------------------------------
         ShowMessage1("Сборка модулей...");
+        String [] modules_names = new String[]{
+                "launcher",
+                "starter",
+                "planner"
+        };
+        for (String module_name: modules_names){
+            ShowMessage2(module_name);
+            compileModule(module_name);
+        }
+        /*
+
         //канал на исполнение независим, поэтому переход в папку отдельный
         Command(
                 "cd " + Utils.DQuotes(sftpChannel.pwd()), //нужны ли тут кавычки?
@@ -74,8 +101,9 @@ public class RemoteInitialiseUser extends CurrentConnectionPass<String> {
                 "chmod 0777 " + launcher,
                 "chmod 0777 " + planner
         );
+        */
         //--------------------------------------
         RemoteFile info = new RemoteFile(target, Current.getAccount().email);
-        writeToFile("", info);
+        user.connection.writeToFile("", info);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/SSH/ConnectionPass_2023.java b/src/Visual_DVM_2021/Passes/SSH/ConnectionPass_2023.java
new file mode 100644
index 00000000..3a64f2b0
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/SSH/ConnectionPass_2023.java
@@ -0,0 +1,34 @@
+package Visual_DVM_2021.Passes.SSH;
+import GlobalData.Machine.Machine;
+import GlobalData.User.User;
+import TestingSystem.DVM.UserConnection;
+import Visual_DVM_2021.Passes.Pass_2021;
+public class ConnectionPass_2023<T> extends Pass_2021<T> {
+    protected Machine machine = null;
+    protected User user = null;
+    //--
+    protected void Connect() throws Exception{
+        user.connection = null;
+        user.connection = new UserConnection(machine, user);
+        System.out.println("Соединение c " + machine.getURL() + " " + user.login + " успешно установлено.");
+    }
+    void Disconnect(){
+        if (user.connection!=null){
+            user.connection.Disconnect();
+            user.connection = null;
+        }
+    }
+    @Override
+    protected void body() throws Exception {
+        Connect();
+        ServerAction();
+    }
+    @Override
+    protected void performFinish() throws Exception {
+        Disconnect();
+    }
+    //--
+    protected void ServerAction() throws Exception{
+
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java b/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java
index 246a29c0..e6e71a64 100644
--- a/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java
+++ b/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.Passes.SSH;
 import Common.Current;
+import files.ConnectionPass;
 //завязан на текущие машину и юзера
 public abstract class CurrentConnectionPass<T> extends ConnectionPass<T> {
     @Override
diff --git a/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java b/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java
index 2ecc9ab9..9dc11b2b 100644
--- a/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java
+++ b/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java
@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.SSH;
 import Common.Current;
 import Common.Global;
 import GlobalData.Tasks.Supervisor.Remote.RemoteTaskSupervisor;
+import files.ConnectionPass;
 public abstract class TaskConnectionPass<S extends RemoteTaskSupervisor> extends ConnectionPass {
     public S supervisor; //инициализация идет в конструкторе потомка.
     public TaskConnectionPass(Class<S> s_class) {
diff --git a/src/files/Planner/Array.h b/src/files/Array.h
similarity index 100%
rename from src/files/Planner/Array.h
rename to src/files/Array.h
diff --git a/src/files/Planner/CompilationSupervisor.h b/src/files/CompilationSupervisor.h
similarity index 100%
rename from src/files/Planner/CompilationSupervisor.h
rename to src/files/CompilationSupervisor.h
diff --git a/src/files/Planner/CompilationTask.h b/src/files/CompilationTask.h
similarity index 100%
rename from src/files/Planner/CompilationTask.h
rename to src/files/CompilationTask.h
diff --git a/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java b/src/files/ConnectionPass.java
similarity index 99%
rename from src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java
rename to src/files/ConnectionPass.java
index 5c82fdd1..5d9b9cef 100644
--- a/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java
+++ b/src/files/ConnectionPass.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.SSH;
+package files;
 import Common.Constants;
 import Common.Utils.Utils;
 import Common.Utils.Validators.ShellParser;
@@ -8,6 +8,7 @@ import GlobalData.User.User;
 import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.SSH.WorkspaceNotFoundException;
 import com.jcraft.jsch.*;
 import javafx.util.Pair;
 
@@ -25,6 +26,7 @@ import java.util.Vector;
 //http://www.jcraft.com/jsch/
 //http://developer-remarks.blogspot.com/2013/05/ssh-via-jsch-example.html
 //https://stackoverflow.com/questions/4194439/sending-commands-to-server-via-jsch-shell-channel
+//todo вывести его. уже есть UserConnection.
 public abstract class ConnectionPass<T> extends Pass_2021<T> {
     //-----------------------------------------------
     public static final String modules = "modules";
diff --git a/src/files/Planner/File.h b/src/files/File.h
similarity index 100%
rename from src/files/Planner/File.h
rename to src/files/File.h
diff --git a/src/files/Planner/Global.h b/src/files/Global.h
similarity index 100%
rename from src/files/Planner/Global.h
rename to src/files/Global.h
diff --git a/src/files/Planner/Planner.cpp b/src/files/Planner.cpp
similarity index 100%
rename from src/files/Planner/Planner.cpp
rename to src/files/Planner.cpp
diff --git a/src/files/Planner/RunSupervisor.h b/src/files/RunSupervisor.h
similarity index 100%
rename from src/files/Planner/RunSupervisor.h
rename to src/files/RunSupervisor.h
diff --git a/src/files/Planner/RunTask.h b/src/files/RunTask.h
similarity index 100%
rename from src/files/Planner/RunTask.h
rename to src/files/RunTask.h
diff --git a/src/files/Planner/String.h b/src/files/String.h
similarity index 100%
rename from src/files/Planner/String.h
rename to src/files/String.h
diff --git a/src/files/Planner/Supervisor.h b/src/files/Supervisor.h
similarity index 100%
rename from src/files/Planner/Supervisor.h
rename to src/files/Supervisor.h
diff --git a/src/files/Planner/Task.h b/src/files/Task.h
similarity index 100%
rename from src/files/Planner/Task.h
rename to src/files/Task.h
diff --git a/src/files/Planner/Text.h b/src/files/Text.h
similarity index 100%
rename from src/files/Planner/Text.h
rename to src/files/Text.h
diff --git a/src/files/Planner/Utils.h b/src/files/Utils.h
similarity index 100%
rename from src/files/Planner/Utils.h
rename to src/files/Utils.h
diff --git a/src/files/Planner/version.h b/src/files/version.h
similarity index 100%
rename from src/files/Planner/version.h
rename to src/files/version.h