From 12cc235973f21afb855b066295d6e6f2ab87dc20 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 2 Dec 2023 16:08:54 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D1=8B=20=D0=B8?=
 =?UTF-8?q?=D0=B7=20=D0=BF=D0=B0=D0=BF=D0=BA=D0=B8=20=D1=81=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BF=D0=BA=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  9 +--
 .../Passes/All/CreateGroupFromDirectory.java  | 66 +++++++++----------
 ...teParallelVariantsCoverageForScenario.java | 44 -------------
 .../Passes/All/PublishTestsFromFiles.java     |  4 --
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  3 -
 5 files changed, 33 insertions(+), 93 deletions(-)
 delete mode 100644 src/Visual_DVM_2021/Passes/All/CreateParallelVariantsCoverageForScenario.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 956b19f0..f5ca236b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,16 +7,11 @@
   </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/All/PublishTests.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.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/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateParallelVariantsCoverageForScenario.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PublishTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PublishTests_OLD.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
index 8d585e7a..070e38bb 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
@@ -1,55 +1,51 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Constants;
+import Common.Current;
+import Common.Utils.Files.VDirectoryChooser;
+import Common.Utils.Utils;
+import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
-public class CreateGroupFromDirectory extends PublishTests {
+import Visual_DVM_2021.Passes.Pass_2021;
 
-    @Override
-    protected PassCode_2021 getCreateTestCode() {
-        return null;
-    }
-    @Override
-    protected String getNoFilesMessage() {
-        return "ни одного файла";
-    }
-    /*
-    File dir = null;
+import java.io.File;
+import java.util.Arrays;
+import java.util.Vector;
+public class CreateGroupFromDirectory extends PublishTests {
     VDirectoryChooser directoryChooser = new VDirectoryChooser("Выбор домашней папки группы");
     @Override
     public String getIconPath() {
         return "/icons/OpenProject.png";
     }
     @Override
-    protected boolean getGroup() {
-        dir = null;
+    protected PassCode_2021 getCreateTestCode() {
+        return PassCode_2021.CreateTestFromDirectory;
+    }
+    @Override
+    protected String getNoFilesMessage() {
+        return "ни одной папки";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
         Utils.RestoreSelectedDirectory(directoryChooser);
-        dir = directoryChooser.ShowDialog();
-        if (dir == null)
+        File dir = directoryChooser.ShowDialog();
+        if (dir == null) {
+            Log.Writeln_("Папка не выбрана");
             return false;
-        else
-            Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir.getParent());
-        //--
+        }
+        //---------------
         if (!dir.isDirectory()) {
             Log.Writeln_(Utils.Brackets(dir) + "\nне является папкой!");
             return false;
         }
-        //--
         if (dir.getName().equals(Constants.data)) {
             Log.Writeln_(Utils.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
             return false;
         }
-        //--
         if (!Utils.validateProjectFile(dir, Log)) {
             Log.Writeln_("Имя папки " + Utils.Brackets(dir.getName()) + " содержит запрещённые символы " + Constants.all_forbidden_characters_string + ", или кириллицу.");
             return false;
         }
         //--
-        if (passes.get(PassCode_2021.PublishGroup).Do(dir.getName().toUpperCase())){
-            group = Current.getGroup();
-            return true;
-        };
-        return false;
-    }
-    @Override
-    protected boolean findFiles() {
         File[] files_ = dir.listFiles(File::isDirectory);
         if (files_ == null) {
             Log.Writeln_("Ошибка при получении списка подпапок");
@@ -59,12 +55,12 @@ public class CreateGroupFromDirectory extends PublishTests {
             Log.Writeln_("В выбранной папке не найдено ни одной папки");
             return false;
         }
-        files.addAll(Arrays.asList(files_));
-        System.out.println(files.size());
-        for (File file: files){
-            System.out.println(file.getAbsolutePath());
-        }
-        return true;
+        if (passes.get(PassCode_2021.PublishGroup).Do(dir.getName().toUpperCase())) {
+            group = Current.getGroup();
+        } else return false;
+        //---------------
+        Vector<File> files = new Vector<>(Arrays.asList(files_));
+        Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, directoryChooser.getCurrentDirectory());
+        return super.canStart(files, group);
     }
-     */
 }
diff --git a/src/Visual_DVM_2021/Passes/All/CreateParallelVariantsCoverageForScenario.java b/src/Visual_DVM_2021/Passes/All/CreateParallelVariantsCoverageForScenario.java
deleted file mode 100644
index 086cb326..00000000
--- a/src/Visual_DVM_2021/Passes/All/CreateParallelVariantsCoverageForScenario.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package Visual_DVM_2021.Passes.All;
-import Common.Current;
-import ProjectData.SapforData.Variants.ParallelVariant;
-import Repository.Component.Sapfor.Sapfor;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
-public class CreateParallelVariantsCoverageForScenario extends CurrentProjectPass {
-    @Override
-    public void Interrupt() throws Exception {
-        Current.getSapfor().Interrupt();
-    }
-    @Override
-    protected void performPreparation() throws Exception {
-    }
-    @Override
-    protected PassCode_2021 necessary() {
-        return PassCode_2021.SPF_GetArrayDistribution;
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (super.canStart(args)) {
-            target.gen_variants_coverage();
-            if (target.parallelVariants.size() == 0) {
-                Log.Writeln_("Покрытие вариантов пусто");
-                return false;
-            } else if (!passes.get(PassCode_2021.SPF_GetArrayDistribution).isDone()) {
-                Log.Writeln_("Варианты неактуальны. Сначала перестройте распределение данных.");
-                return false;
-            }
-            return true;
-        }
-        return false;
-    }
-    protected void body() throws Exception {
-        for (ParallelVariant p : target.parallelVariants.Data.values())
-            if (!passes.get(PassCode_2021.SPF_CreateParallelVariant).Do(p)) break;
-    }
-    @Override
-    protected void performFinish() throws Exception {
-        //распаковку соо делаем только 1 раз. после всей массы вариантов.
-        Sapfor sapfor = Current.getSapfor();
-        target.unpackMessagesAndLog(sapfor.getOutputMessage(), sapfor.getOutput());
-    }
-}
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java b/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java
index 45b7f1c8..4ec72935 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java
@@ -9,10 +9,6 @@ import Visual_DVM_2021.Passes.Pass_2021;
 import java.io.File;
 import java.util.Vector;
 public class PublishTestsFromFiles extends PublishTests {
-    @Override
-    public String getIconPath() {
-        return "/icons/AddFile.png";
-    }
     VFileChooser fileChooser = new VFileChooser("Выберите файл для создания теста");
     @Override
     protected PassCode_2021 getCreateTestCode() {
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index afb21e88..1ee5d891 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -274,7 +274,6 @@ public enum PassCode_2021 {
     OpenProject,
     CloseProject,
     //->
-    CreateParallelVariantsCoverageForScenario,
     SaveFunctionsGraphCoordinates,
     DeleteSelectedVersions,
     CreateTestsGroupFromSelectedVersions,
@@ -423,8 +422,6 @@ public enum PassCode_2021 {
                 return "Вставка DVMH-регионов";
             case SPF_ResolveCommonBlockConflicts:
                 return "Разрешение конфликтов common блоков";
-            case CreateParallelVariantsCoverageForScenario:
-                return "Построение минимального покрытия параллельных вариантов";
             case OpenProject:
                 return "Открытие проекта (пакетный режим)";
             case CloseProject: