From 87ed3bd003e379ca23ccb9314e9867091c287eae Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 21 Jul 2024 23:19:18 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D1=80=D0=B0=D1=82=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=8F=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B9=20=D1=81=D0=B0?=
 =?UTF-8?q?=D0=BF=D1=84=D0=BE=D1=80=D0=B0=20=D0=B8=20=D0=BA=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=BC=D0=B8=D1=82=20=D1=81=D1=82=D0=B0=D1=80=D1=8B=D1=85=20?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  7 +++
 properties                                    |  2 +-
 src/Common/UI/UI.java                         | 48 ++++++++++++-------
 src/Common/Utils/Utils.java                   |  9 ++--
 src/Repository/Component/Visualiser.java      |  2 +-
 .../Common/Test/UI/AddTestMenu.java           |  1 +
 .../ServerSapfor/ServerSapforsDBTable.java    | 13 +++++
 .../Passes/All/CreateTestFromDirectory.java   | 46 ++++++++++++------
 .../Passes/All/CreateTestFromProject.java     |  2 +-
 .../All/CreateTestFromSelectedFiles.java      | 28 ++++++++++-
 10 files changed, 120 insertions(+), 38 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index af3de876..91523fe9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,15 @@
   <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/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/AddTestMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/AddTestMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.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/CreateTestFromSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index bdba6eb0..d752dace 100644
--- a/properties
+++ b/properties
@@ -10,7 +10,7 @@
   "SMTPHost": "smtp.mail.ru",
   "SMTPPort": 465,
   "MailSocketPort": 465,
-  "collapseCredentials": false,
+  "collapseCredentials": true,
   "collapseFileGraphs": false,
   "collapseFileMessages": false,
   "collapseProjectTrees": false,
diff --git a/src/Common/UI/UI.java b/src/Common/UI/UI.java
index 14e1ab53..5b49eceb 100644
--- a/src/Common/UI/UI.java
+++ b/src/Common/UI/UI.java
@@ -101,6 +101,7 @@ import javax.swing.text.Highlighter;
 import javax.swing.tree.TreeCellRenderer;
 import java.awt.*;
 import java.util.LinkedHashMap;
+import java.util.Locale;
 import java.util.Stack;
 import java.util.Vector;
 
@@ -173,7 +174,7 @@ public class UI {
     public static void refreshTheme() {
         Current.set(Current.Theme, themes.get(Global.db.settings.get(SettingName.DarkThemeOn).toBoolean() ? VisualiserThemeName.Dark : VisualiserThemeName.Light));
         // refreshTheme_r(Visualiser.getMainWindow().MainPanel);
-        /*
+        /* Открыть
         refreshTheme_r(Visualiser.searchReplaceForm.MainPanel);
         refreshTheme_r(Visualiser.ComponentsWindow.fields.MainPanel);
         refreshTheme_r(Visualiser.remoteFileChooser.fields.MainPanel);
@@ -272,22 +273,35 @@ public class UI {
     //-
     public static void CreateAll() {
         //<editor-fold desc="Локализация компонентов окна JFileChooser">
-        UIManager.put(
-                "FileChooser.openButtonText", "Открыть");
-        UIManager.put(
-                "FileChooser.saveButtonText", "Сохранить");
-        UIManager.put(
-                "FileChooser.cancelButtonText", "Отмена");
-        UIManager.put(
-                "FileChooser.fileNameLabelText", "Наименование файла");
-        UIManager.put(
-                "FileChooser.filesOfTypeLabelText", "Типы файлов");
-        UIManager.put(
-                "FileChooser.lookInLabelText", "Директория");
-        UIManager.put(
-                "FileChooser.saveInLabelText", "Сохранить в директории");
-        UIManager.put(
-                "FileChooser.folderNameLabelText", "Путь директории");
+        UIManager.put("FileChooser.openButtonText", "Открыть");
+        UIManager.put("FileChooser.cancelButtonText", "Отмена");
+        UIManager.put("FileChooser.lookInLabelText", "Смотреть в");
+        UIManager.put("FileChooser.fileNameLabelText", "Имя файла");
+        UIManager.put("FileChooser.filesOfTypeLabelText", "Тип файла");
+
+        UIManager.put("FileChooser.saveButtonText", "Сохранить");
+        UIManager.put("FileChooser.saveButtonToolTipText", "Сохранить");
+        UIManager.put("FileChooser.openButtonToolTipText", "Открыть");
+        UIManager.put("FileChooser.cancelButtonText", "Отмена");
+        UIManager.put("FileChooser.cancelButtonToolTipText", "Отмена");
+
+        UIManager.put("FileChooser.lookInLabelText", "Папка");
+        UIManager.put("FileChooser.saveInLabelText", "Папка");
+        UIManager.put("FileChooser.fileNameLabelText", "Имя файла");
+        UIManager.put("FileChooser.filesOfTypeLabelText", "Тип файлов");
+
+        UIManager.put("FileChooser.upFolderToolTipText", "На один уровень вверх");
+        UIManager.put("FileChooser.newFolderToolTipText", "Создание новой папки");
+        UIManager.put("FileChooser.listViewButtonToolTipText", "Список");
+        UIManager.put("FileChooser.detailsViewButtonToolTipText", "Таблица");
+        UIManager.put("FileChooser.fileNameHeaderText", "Имя");
+        UIManager.put("FileChooser.fileSizeHeaderText", "Размер");
+        UIManager.put("FileChooser.fileTypeHeaderText", "Тип");
+        UIManager.put("FileChooser.fileDateHeaderText", "Изменен");
+        UIManager.put("FileChooser.fileAttrHeaderText", "Атрибуты");
+
+        UIManager.put("FileChooser.acceptAllFileFilterText", "Все файлы");
+
         //</editor-fold>
         //<editor-fold desc="Локализация компонентов окна подтверждения">
         UIManager.put("OptionPane.yesButtonText", "Да");
diff --git a/src/Common/Utils/Utils.java b/src/Common/Utils/Utils.java
index 2b31bd46..dc887430 100644
--- a/src/Common/Utils/Utils.java
+++ b/src/Common/Utils/Utils.java
@@ -1219,8 +1219,9 @@ public class Utils {
                     }
                     // System.out.println();
                     //добавление строки в результат.
-                    if ((line.length() > 0) || Global.db.settings.get(SettingName.EmptyLinesOn).toBoolean() &&
-                            Global.db.settings.get(SettingName.SpacesOn).toBoolean()) {
+                    if ((line.length() > 0) || Global.db.settings.get(SettingName.EmptyLinesOn).toBoolean()
+                       //     Global.db.settings.get(SettingName.SpacesOn).toBoolean()
+                    ) {
                         lines.add(line.toString());
                         visible_lines.add(v_line.toString());
                     }
@@ -1237,7 +1238,9 @@ public class Utils {
         if ((i > 0) && (c != '\n')) {
             //строка оборвалась на EOF
             //добавление строки в результат.
-            if ((line.length() > 0) || Global.db.settings.get(SettingName.EmptyLinesOn).toBoolean() && Global.db.settings.get(SettingName.SpacesOn).toBoolean()) {
+            if ((line.length() > 0) || Global.db.settings.get(SettingName.EmptyLinesOn).toBoolean()
+               //     && Global.db.settings.get(SettingName.SpacesOn).toBoolean()
+            ) {
                 lines.add(line.toString());
                 visible_lines.add(v_line.toString());
             }
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 4142b040..94ac18b4 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 = 1107;
+        version = 1109;
         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/Test/UI/AddTestMenu.java b/src/TestingSystem/Common/Test/UI/AddTestMenu.java
index d1439f58..f2176618 100644
--- a/src/TestingSystem/Common/Test/UI/AddTestMenu.java
+++ b/src/TestingSystem/Common/Test/UI/AddTestMenu.java
@@ -8,5 +8,6 @@ public class AddTestMenu extends VisualiserMenu {
         add(Pass_2021.passes.get(PassCode_2021.CreateTestFromProject).createMenuItem());
         add(Pass_2021.passes.get(PassCode_2021.CreateTestFromDirectory).createMenuItem());
         add(Pass_2021.passes.get(PassCode_2021.CreateTestsFromFiles).createMenuItem());
+        add(Pass_2021.passes.get(PassCode_2021.CreateTestFromSelectedFiles).createMenuItem());
     }
 }
diff --git a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
index 214abd5a..049ee274 100644
--- a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
@@ -4,6 +4,9 @@ import Common.Database.iDBTable;
 import Common.UI.DataSetControlForm;
 import Common.UI.Tables.TableRenderers;
 import Common.UI.UI;
+
+import java.util.Comparator;
+import java.util.Vector;
 public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
     public ServerSapforsDBTable() {
         super(ServerSapfor.class);
@@ -59,4 +62,14 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
             }
         };
     }
+    @Override
+    public Comparator<ServerSapfor> getComparator() {
+        return new Comparator<ServerSapfor>() {
+            @Override
+            public int compare(ServerSapfor o1, ServerSapfor o2) {
+                return o2.id-o1.id;
+            }
+        };
+       // return Comparator.comparingInt(o -> o.).reversed();
+    }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
index c89dd04b..9ddef7cc 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
@@ -15,9 +15,9 @@ import Visual_DVM_2021.Passes.Pass_2021;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.Vector;
 public class CreateTestFromDirectory extends Pass_2021<Test> {
-    VDirectoryChooser directoryChooser = new VDirectoryChooser("Выбор домашней папки теста");
     @Override
     public String getIconPath() {
         return "/icons/OpenProject.png";
@@ -32,9 +32,30 @@ public class CreateTestFromDirectory extends Pass_2021<Test> {
     }
     Group group = null;
     File dir = null;
-    boolean from_directory_chooser = false;
+    boolean from_files_chooser = false;
+    //--
+    void saveDirectory() {
+        Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory,
+                (dir.getParentFile() == null) ? dir.getAbsolutePath() : dir.getParent()
+        );
+    }
+    Vector<File> files = null;
+    protected boolean selectFiles() {
+        VDirectoryChooser directoryChooser = new VDirectoryChooser("Выбор домашней папки теста");
+        Utils.RestoreSelectedDirectory(directoryChooser);
+        dir = directoryChooser.ShowDialog();
+        if (dir == null) {
+            Log.Writeln_("Папка не выбрана.");
+            return false;
+        } else {
+            files = new Vector<>(Arrays.asList(dir.listFiles()));
+            saveDirectory();
+        }
+        return true;
+    }
+    //--
     Vector<ProjectFile> project_files = new Vector<>();
-    protected boolean initTarget() throws Exception{
+    protected boolean initTarget() throws Exception {
         target = new Test();
         target.sender_address = Current.getAccount().email;
         target.sender_name = Current.getAccount().name;
@@ -44,26 +65,23 @@ public class CreateTestFromDirectory extends Pass_2021<Test> {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
+        files = null;
         if (args.length == 0) {
-            from_directory_chooser = true;
+            //--
+            from_files_chooser = true;
             if (!Current.Check(Log, Current.Group))
                 return false;
-            Utils.RestoreSelectedDirectory(directoryChooser);
-            dir = directoryChooser.ShowDialog();
             group = Current.getGroup();
-            if (dir == null) {
-                Log.Writeln_("Папка не выбрана.");
+            if (!selectFiles())
                 return false;
-            } else {
-                Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir.getParent());
-            }
+            //-
         } else {
-            from_directory_chooser = false;
+            from_files_chooser = false;
             dir = (File) args[0];
             group = (Group) args[1];
+            files = new Vector<>(Arrays.asList(dir.listFiles()));
         }
         //---
-        File[] files = dir.listFiles();
         int subdirs = 0;
         int bad = 0;
         int active_programs = 0;
@@ -192,7 +210,7 @@ public class CreateTestFromDirectory extends Pass_2021<Test> {
     @Override
     protected void performDone() throws Exception {
         super.performDone();
-        if (from_directory_chooser)
+        if (from_files_chooser)
             passes.get(PassCode_2021.PublishTest).Do(target);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java
index e0038739..c7564008 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java
@@ -17,7 +17,7 @@ public class CreateTestFromProject extends CreateTestFromDirectory {
             if (Current.Check(Log, Current.Group, Current.Project)) {
                 project = Current.getProject();
                 if (super.canStart(Current.getProject().Home, Current.getGroup())){
-                    from_directory_chooser = true; //чтобы опубликовал.
+                    from_files_chooser = true; //чтобы опубликовал.
                     return true;
                 }
             }
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java
index 5863be77..85106d4f 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java
@@ -1,4 +1,30 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.Files.VFileChooser;
+import Common.Utils.Utils;
+import GlobalData.Settings.SettingName;
+import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
-public class CreateTestFromSelectedFiles extends Pass_2021 {
+
+import java.io.File;
+import java.util.Vector;
+public class CreateTestFromSelectedFiles extends CreateTestFromDirectory {
+    @Override
+    public String getIconPath() {
+        return "/icons/MassFiles.png";
+    }
+    @Override
+    protected boolean selectFiles() {
+        VFileChooser files_chooser = new VFileChooser("Выбор файлов");
+        Utils.RestoreSelectedDirectory(files_chooser);
+        Vector<File> res  = files_chooser.ShowMultiDialog();
+        dir = files_chooser.getCurrentDirectory();
+        if (res.isEmpty()){
+            Log.Writeln_("Не выбрано ни одного файла.");
+            return false;
+        } else {
+            this.files = res;
+            saveDirectory();
+        }
+        return true;
+    }
 }