From 90fb80f0874110d506483b1ff82456afb9db6849 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 27 Oct 2023 21:23:53 +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=A3=D1=87=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=81=D0=B8=D1=82=D1=83=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D1=87=D0=BD=D0=BE=D0=B9?=
 =?UTF-8?q?=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8=20SAPFOR=20=D0=B8=D0=B7?=
 =?UTF-8?q?=20=D0=B2=D0=B8=D0=B7=D1=83=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  7 +---
 .../SapforTasksPackageInterface.java          | 35 +++++++++++++++++++
 .../Passes/All/InstallServerSapfor.java       | 24 ++++++-------
 .../UI/Main/SapforPackageForm.java            |  7 ++--
 4 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 997786e4..9be2f5f2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,13 +8,8 @@
   <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/SapforTestingSystem/Json/SapforTasksResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksResults_json.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.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/UI/Main/SapforPackageForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
index eae3870c..eafbd1ba 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
@@ -2,7 +2,10 @@ package SapforTestingSystem.SapforTasksPackage;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
+import ProjectData.Files.DBProjectFile;
+import ProjectData.Files.FileType;
 import SapforTestingSystem.Json.SapforTasksResults_json;
+import SapforTestingSystem.Json.SapforVersion_json;
 import SapforTestingSystem.SapforTask.SapforTask;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -14,6 +17,27 @@ public class SapforTasksPackageInterface {
     public static File getPackageArchive(SapforTasksPackage package_in) {
         return new File(Global.SapforPackagesDirectory, package_in.id + ".zip");
     }
+    public static Vector<DBProjectFile> getProjectFiles(String dir_in) {
+        Vector<DBProjectFile> res = new Vector<>();
+        //получить список файлов которые могут быть файлами проекта в заданной папке
+        //гарантированно нет вложенных.
+        File dir = new File(dir_in);
+        File[] files = dir.listFiles();
+        //-
+        if (files != null) {
+            for (File file : files) {
+                if (file.isFile()) {
+                    DBProjectFile projectFile = new DBProjectFile();
+                    projectFile.file = file;
+                    projectFile.AutoDetectProperties();
+                    if (!projectFile.fileType.equals(FileType.forbidden)) {
+                        res.add(projectFile);
+                    }
+                }
+            }
+        }
+        return res;
+    }
     public static DefaultMutableTreeNode getTree(SapforTasksPackage package_in) {
         SapforTasksResults_json results_json = getLocalResults(package_in);
         //--  флаги                 группы
@@ -30,6 +54,17 @@ public class SapforTasksPackageInterface {
                 Vector<SapforTask> tasks = tasksByGroups.get(group);
                 for (SapforTask task : tasks) {
                     DefaultMutableTreeNode taskNode = new DefaultMutableTreeNode(task.test_description);
+                    for (SapforVersion_json version: task.versions){
+                        DefaultMutableTreeNode versionNode = new DefaultMutableTreeNode(version.description);
+                        taskNode.add(versionNode);
+                    }
+                    for (SapforVersion_json version: task.variants){
+                        DefaultMutableTreeNode versionNode = new DefaultMutableTreeNode(version.description);
+                        taskNode.add(versionNode);
+                    }
+                    //для каждой версии в узлы положить:
+                    //получить список исходных файлов.
+                    //получить список файлов для коррекции стиля кода.
                     groupNode.add(taskNode);
                 }
                 flagsNode.add(groupNode);
diff --git a/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java b/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
index 44b41c4b..05504a29 100644
--- a/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
+++ b/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
@@ -50,6 +50,9 @@ public class InstallServerSapfor extends ConnectionPass<Object> {
         RemoteFile testingSystemHome = new RemoteFile(sftpChannel.pwd(), "testing_system", true);
         RemoteFile repo = new RemoteFile(testingSystemHome.full_name, "Repo", true);
         RemoteFile repoSapforHome = new RemoteFile(repo.full_name + "/sapfor/experts/Sapfor_2017/_bin", true);
+        RemoteFile old_bin = new RemoteFile(repoSapforHome.full_name, "Sapfor_F");
+        if (Exists(repoSapforHome.full_name, "Sapfor_F"))
+            sftpChannel.rm(old_bin.full_name);
         ShowMessage2("Вывод в консоли визуализатора");
         //-->>
         ShowMessage1("Синхронизация ветви DVM...");
@@ -95,25 +98,18 @@ public class InstallServerSapfor extends ConnectionPass<Object> {
         return result;
     }
     @Override
-    protected void performFinish() throws Exception {
-        super.performFinish();
+    protected void performDone() throws Exception {
+        super.performDone();
         passes.get(PassCode_2021.SynchronizeTests).Do();
     }
     @Override
+    protected void showFail() throws Exception {
+        Log.Writeln_("Файл [SAPFOR_F] не найден!");
+    }
+    @Override
     protected void showDone() throws Exception {
         super.showDone();
         Global.testingServer.db.serverSapfors.ui_.Show(serverSapfor.getPK());
     }
 }
-/*
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import SapforTestingSystem.ServerSapfor.ServerSapfor;
-import Visual_DVM_2021.Passes.TestingSystemPass;
-public class InstallServerSapfor extends TestingSystemPass<ServerSapfor> {
-    @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.InstallSapforForTesting));
-    }
-}
- */
+
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
index 4d54801b..668d0b84 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
@@ -6,9 +6,10 @@ import GlobalData.FormsParams.DBForm;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageTree;
+
+import javax.swing.*;
 public class SapforPackageForm extends Dialog<SapforTasksPackage, SapforPackageFields> {
     SapforTasksPackage sapforTasksPackage = null;
-
     private DBForm info = null;
     public SapforPackageForm() {
         super(SapforPackageFields.class);
@@ -24,7 +25,9 @@ public class SapforPackageForm extends Dialog<SapforTasksPackage, SapforPackageF
     public void Init(Object... params) {
         sapforTasksPackage = (SapforTasksPackage) params[0];
         fields.lObjectName.setText(sapforTasksPackage.id);
-        fields.getTreePanel().add(new SapforTasksPackageTree(SapforTasksPackageInterface.getTree(sapforTasksPackage)));
+        fields.getTreePanel().add(
+                new JScrollPane(
+                        new SapforTasksPackageTree(SapforTasksPackageInterface.getTree(sapforTasksPackage))));
         /*
         if (Global.db.sapforProfiles.size() > 0) {
             for (Object key : Global.db.sapforProfiles.Data.keySet()) {