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

---
 .idea/workspace.xml                           | 11 ++-
 .../GroupsMenuBar/GroupsMenuBar.java          |  1 +
 .../Menus_2023/TestsMenuBar/TestsMenuBar.java |  2 +-
 .../Passes/All/CreateGroupFromFiles.java      | 50 +++++++++++++
 .../Passes/All/CreateTestFromProject.java     |  1 +
 ...omFiles.java => CreateTestsFromFiles.java} |  4 +-
 .../CreateTestsGroupFromSelectedVersions.java | 14 +---
 .../Passes/All/PublishTests.java              |  4 +
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  7 +-
 .../Passes/PublishTests_OLD.java              | 73 -------------------
 10 files changed, 76 insertions(+), 91 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java
 rename src/Visual_DVM_2021/Passes/All/{PublishTestsFromFiles.java => CreateTestsFromFiles.java} (91%)
 delete mode 100644 src/Visual_DVM_2021/Passes/PublishTests_OLD.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f5ca236b..a9a4ffb8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,11 +7,16 @@
   </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/CreateGroupFromFiles.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/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/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/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" 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/Visual_DVM_2021/Passes/All/CreateTestFromProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.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/PublishTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.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_OLD.java" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java b/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
index 07bc9f99..7f65f410 100644
--- a/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
+++ b/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
@@ -12,6 +12,7 @@ public class GroupsMenuBar extends DataMenuBar {
         super("группы", PassCode_2021.SynchronizeTests, PassCode_2021.ConvertCorrectnessTests,
                 PassCode_2021.PublishGroup,
                 PassCode_2021.CreateGroupFromDirectory,
+                PassCode_2021.CreateGroupFromFiles,
                 PassCode_2021.EditGroup,
                 PassCode_2021.DeleteGroup
                 );
diff --git a/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java b/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
index a7bf656f..d4e94745 100644
--- a/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
+++ b/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
@@ -6,7 +6,7 @@ public class TestsMenuBar extends DataMenuBar {
         super("тесты",
                 PassCode_2021.CreateTestFromProject,
                 PassCode_2021.CreateTestFromDirectory,
-                PassCode_2021.PublishTestsFromFiles, ///----------------------------
+                PassCode_2021.CreateTestsFromFiles, ///----------------------------
                 PassCode_2021.EditTest,
                 PassCode_2021.DownloadTest,
                 PassCode_2021.DeleteTest);
diff --git a/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java b/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java
new file mode 100644
index 00000000..e888ae0c
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java
@@ -0,0 +1,50 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Constants;
+import Common.Current;
+import Common.Utils.Files.VFileChooser;
+import Common.Utils.Utils;
+import GlobalData.Settings.SettingName;
+import TestingSystem.Common.Group.Group;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
+
+import java.io.File;
+import java.util.Vector;
+public class CreateGroupFromFiles extends PublishTests{
+    Group group;
+    VFileChooser fileChooser = new VFileChooser("Выберите файлы для создания тестов");
+
+    @Override
+    protected PassCode_2021 getCreateTestCode() {
+        return PassCode_2021.CreateTestFromFile;
+    }
+    @Override
+    protected String getNoFilesMessage() {
+        return "ни одного файла";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        Utils.RestoreSelectedDirectory(fileChooser);
+        Vector<File> files = fileChooser.ShowMultiDialog();
+        if (files.isEmpty()){
+            Log.Writeln_("Не выбрано ни одного файла.");
+            return false;
+        }
+        File dir = fileChooser.getCurrentDirectory();
+        Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir);
+        //---------------
+        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();
+        } else return false;
+        //--
+        return super.canStart(files, group);
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java
index c6e3ea2d..052c588c 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java
@@ -4,6 +4,7 @@ import ProjectData.Files.FileState;
 import ProjectData.Files.ProjectFile;
 import ProjectData.Project.db_project_info;
 import TestingSystem.Common.Group.Group;
+//из текущего проекта.
 public class CreateTestFromProject extends CreateTestFromDirectory {
     db_project_info project;
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java b/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java
similarity index 91%
rename from src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java
rename to src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java
index 4ec72935..e1da10b3 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java
@@ -8,8 +8,8 @@ import Visual_DVM_2021.Passes.Pass_2021;
 
 import java.io.File;
 import java.util.Vector;
-public class PublishTestsFromFiles extends PublishTests {
-    VFileChooser fileChooser = new VFileChooser("Выберите файл для создания теста");
+public class CreateTestsFromFiles extends PublishTests {
+    VFileChooser fileChooser = new VFileChooser("Выберите файлы для создания тестов");
     @Override
     protected PassCode_2021 getCreateTestCode() {
         return PassCode_2021.CreateTestFromFile;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
index 265a9dea..67033c95 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
@@ -1,14 +1,7 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Current;
-import Common.Global;
-import Common.UI.UI;
-import Common.Utils.Utils;
-import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.PublishTests_OLD;
-
-import java.util.Vector;
-public class CreateTestsGroupFromSelectedVersions extends PublishTests_OLD {
+import Visual_DVM_2021.Passes.Pass_2021;
+public class CreateTestsGroupFromSelectedVersions extends Pass_2021 {
+    /*
     Vector<db_project_info> versions = new Vector<>();
     @Override
     public String getIconPath() {
@@ -65,4 +58,5 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests_OLD {
         return UI.Question("В группу " + Utils.Brackets(group.description) +
                 "\nбудет добавлено " + target.size() + " тестов.\nПродолжить");
     }
+     */
 }
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTests.java b/src/Visual_DVM_2021/Passes/All/PublishTests.java
index d1099a20..dc5d35ef 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishTests.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishTests.java
@@ -19,6 +19,10 @@ public abstract class PublishTests extends TestingSystemPass<Vector<Test>> {
         return "";
     }
     @Override
+    public String getIconPath() {
+        return "/icons/AddFile.png";
+    }
+    @Override
     protected boolean needsAnimation() {
         return true;
     }
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 1ee5d891..e45d8628 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -301,14 +301,17 @@ public enum PassCode_2021 {
     CreateTestFromProject,
     SPF_RemoveComments,
     CreateTestFromFile,
-    PublishTestsFromFiles,
+    CreateTestsFromFiles,
+    CreateGroupFromFiles,
     //->
     TestPass;
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
-            case PublishTestsFromFiles:
+            case CreateGroupFromFiles:
+                return "Создать группу из файлов в папке";
+            case CreateTestsFromFiles:
                 return "Добавить тесты из файлов к текущей группе";
             case CreateTestFromFile:
                 return "Создать тест из файла";
diff --git a/src/Visual_DVM_2021/Passes/PublishTests_OLD.java b/src/Visual_DVM_2021/Passes/PublishTests_OLD.java
deleted file mode 100644
index d36417e3..00000000
--- a/src/Visual_DVM_2021/Passes/PublishTests_OLD.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package Visual_DVM_2021.Passes;
-import Common.UI.UI;
-import Common.Utils.Utils;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Common.Group.Group;
-import TestingSystem.Common.Test.Test;
-import Visual_DVM_2021.Passes.All.CreateTestFromDirectory;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
-
-import java.io.File;
-import java.util.Vector;
-public abstract class PublishTests_OLD extends TestingSystemPass<Vector<Test>> {
-    @Override
-    public String getButtonText() {
-        return "";
-    }
-    @Override
-    protected boolean needsAnimation() {
-        return true;
-    }
-    //---
-    protected Group group;
-    protected Vector<File> files;
-    protected abstract boolean getGroup();
-    protected boolean findFiles(){ return false;}
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        target = new Vector<>();
-        files = new Vector<>();
-        group = null;
-        //--------------------------
-
-        if (!getGroup()) return false;
-        if (group == null) {
-            Log.Writeln_("Группа не выбрана.");
-            return false;
-        }
-        if (!findFiles()) return false;
-        if (files.isEmpty()) {
-            Log.Writeln_("Не найдено ни одной папки для формирования теста.");
-            return false;
-        }
-        //---
-        CreateTestFromDirectory createTestFromDirectory = (CreateTestFromDirectory) passes.get(PassCode_2021.CreateTestFromDirectory);
-        //---
-        for (File file : files) {
-            if (createTestFromDirectory.Do(file, group))
-                target.add(createTestFromDirectory.target);
-        }
-        //---
-        if (target.isEmpty()) {
-            Log.Writeln_("Не удалось создать ни одного теста.");
-            return false;
-        }
-        //---
-        return UI.Question("В группу " + Utils.Brackets(group.description) +
-                "\nбудет добавлено " + target.size() + " тестов.\nПродолжить");
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.PublishObjects, null, target));
-    }
-    @Override
-    protected void performFinish() throws Exception {
-        super.performFinish();
-        passes.get(PassCode_2021.SynchronizeTests).Do();
-    }
-    @Override
-    protected void FocusResult() {
-        UI.getMainWindow().FocusTests();
-    }
-}