From 245ed7c5f03e509ef6ac420a87d4cea741760ae7 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 14 Feb 2025 00:13:00 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=86=D0=B5=D0=BF=D0=BE=D1=87=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B5=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B9=20=D0=B2=20=D0=BE=D0=BF=D0=B8=D1=81?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=82=D0=B5=D1=81=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=B5=D0=B3=D0=BE=20=D0=B8=D0=BC=D0=BF?=
 =?UTF-8?q?=D0=BE=D1=80=D1=82=D0=B5=20=D0=B8=D0=B7=20=D0=BF=D0=B0=D0=BA?=
 =?UTF-8?q?=D0=B5=D1=82=D0=B0=20=D1=81=D0=B0=D0=BF=D1=84=D0=BE=D1=80=20v++?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  9 +++--
 properties                                    |  2 +-
 .../Visual/Tables/RendererLongCell.java       | 16 +++++++++
 .../Repository/Server/ServerRequestUnit.java  |  2 +-
 .../Common/Test/UI/TestDialog.java            |  5 ++-
 .../Common/Test/UI/TestFields.form            | 35 +++++++++++++++----
 .../Common/Test/UI/TestFields.java            |  1 +
 .../Common/Test/UI/TestsForm.java             | 19 ++++++++++
 .../TestingSystem/Common/TestingServer.java   | 22 ++++++++----
 9 files changed, 93 insertions(+), 18 deletions(-)
 create mode 100644 src/Common/Visual/Tables/RendererLongCell.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fcbaf64a..b25fa66f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,10 +7,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererLongCell.java" afterDir="false" />
       <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/_VisualDVM/Passes/All/DownloadDVMPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackages.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerRequestUnit.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerRequestUnit.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 3790ec4d..29e044b3 100644
--- a/properties
+++ b/properties
@@ -1,6 +1,6 @@
 {
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1739383720\\1835",
+  "ProjectsSearchDirectory": "E:\\BUG",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
diff --git a/src/Common/Visual/Tables/RendererLongCell.java b/src/Common/Visual/Tables/RendererLongCell.java
new file mode 100644
index 00000000..11f5aae7
--- /dev/null
+++ b/src/Common/Visual/Tables/RendererLongCell.java
@@ -0,0 +1,16 @@
+package Common.Visual.Tables;
+import Common.MainModule_;
+import Common.Visual.Fonts.VisualiserFonts;
+
+import javax.swing.*;
+public class RendererLongCell extends RendererCell {
+    @Override
+    public Object Init(JTable table, Object value, int row, int column) {
+        return value;
+    }
+    @Override
+    public void Display() {
+        setText(value.toString());
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain).deriveFont(12.0f));
+    }
+}
diff --git a/src/_VisualDVM/Repository/Server/ServerRequestUnit.java b/src/_VisualDVM/Repository/Server/ServerRequestUnit.java
index 93de138e..15faf429 100644
--- a/src/_VisualDVM/Repository/Server/ServerRequestUnit.java
+++ b/src/_VisualDVM/Repository/Server/ServerRequestUnit.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Repository.Server;
 import java.io.Serializable;
 public class ServerRequestUnit {
-    public static final int version = 1164;
+    public static final int version = 1165;
     //--------------------------------------------
     public String codeName;
     public String arg;
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java
index a8667af9..e53bfb23 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java
@@ -11,7 +11,7 @@ public class TestDialog extends DBObjectDialog<Test, TestFields> {
     }
     @Override
     public int getDefaultHeight() {
-        return 200;
+        return 400;
     }
     @Override
     public int getDefaultWidth() {
@@ -31,10 +31,12 @@ public class TestDialog extends DBObjectDialog<Test, TestFields> {
         fields.tfName.setText(Result.description);
         fields.sMinDim.setValue(Result.min_dim);
         fields.sMaxDim.setValue(Result.max_dim);
+        fields.taExtendedDescription.setText(Result.extended_description);
     }
     @Override
     public void ProcessResult() {
         Result.description = fields.tfName.getText();
+        Result.extended_description=fields.taExtendedDescription.getText();
         Result.min_dim = (int) fields.sMinDim.getValue();
         Result.max_dim = (int) fields.sMaxDim.getValue();
         if (!edit) {
@@ -47,5 +49,6 @@ public class TestDialog extends DBObjectDialog<Test, TestFields> {
         fields.tfName.setEnabled(false);
         fields.sMinDim.setEnabled(false);
         fields.sMaxDim.setEnabled(false);
+        fields.taExtendedDescription.setEnabled(false);
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestFields.form b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestFields.form
index ca315e8a..874a0b9e 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestFields.form
+++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestFields.form
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.TestingSystem.Common.Test.UI.TestFields">
-  <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="6" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="500" height="400"/>
+      <xy x="20" y="20" width="718" height="400"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -19,7 +19,7 @@
       </component>
       <vspacer id="9a439">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <component id="ddf02" class="javax.swing.JTextField" binding="tfName" custom-create="true">
@@ -34,7 +34,7 @@
       </component>
       <component id="fbef6" class="javax.swing.JLabel">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
         </constraints>
         <properties>
           <font name="Times New Roman" size="16" style="2"/>
@@ -43,7 +43,7 @@
       </component>
       <component id="2b54" class="javax.swing.JSpinner" binding="sMaxDim">
         <constraints>
-          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+          <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="50" height="-1"/>
             <maximum-size width="50" height="-1"/>
           </grid>
@@ -52,7 +52,7 @@
       </component>
       <component id="82807" class="javax.swing.JLabel">
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
         </constraints>
         <properties>
           <font name="Times New Roman" size="16" style="2"/>
@@ -61,13 +61,34 @@
       </component>
       <component id="c59e6" class="javax.swing.JSpinner" binding="sMinDim">
         <constraints>
-          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="50" height="-1"/>
             <maximum-size width="50" height="-1"/>
           </grid>
         </constraints>
         <properties/>
       </component>
+      <component id="6397b" class="javax.swing.JTextArea" binding="taExtendedDescription">
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="50"/>
+          </grid>
+        </constraints>
+        <properties>
+          <lineWrap value="true"/>
+        </properties>
+      </component>
+      <component id="c5c14" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <font name="Times New Roman" size="16" style="2"/>
+          <text value="описание"/>
+          <verticalAlignment value="0"/>
+          <verticalTextPosition value="0"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestFields.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestFields.java
index 238c764d..7689df2c 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestFields.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestFields.java
@@ -8,6 +8,7 @@ public class TestFields implements DialogFields {
     public JTextField tfName;
     public JSpinner sMinDim;
     public JSpinner sMaxDim;
+    public JTextArea taExtendedDescription;
     private JPanel content;
     public TestFields() {
         sMinDim.setModel(new SpinnerNumberModel(1, 0, 16, 1));
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
index d289cb24..595421da 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
@@ -1,16 +1,21 @@
 package _VisualDVM.TestingSystem.Common.Test.UI;
+import Common.CommonConstants;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
+import Common.Utils.Utils_;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Tables.HeaderTextFilter;
+import Common.Visual.Tables.RendererHiddenList;
+import Common.Visual.Tables.RendererLongCell;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import _VisualDVM.Visual.Tables.RendererHyperlinks;
 
 import javax.swing.*;
 public class TestsForm extends DataSetControlForm<Test> {
@@ -26,6 +31,20 @@ public class TestsForm extends DataSetControlForm<Test> {
                         return object.description;
                     }
                 },
+                new ColumnInfo<Test>("описание") {
+                    @Override
+                    public Object getFieldAt(Test object) {
+                        return object.extended_description.replace("\n","→");
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererLongCell.class;
+                    }
+                    @Override
+                    public int getMaxWidth() {
+                        return 600;
+                    }
+                },
                 new ColumnInfo<Test>("min_dim") {
                     @Override
                     public Object getFieldAt(Test object) {
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index 666847d1..e3f8b678 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -632,7 +632,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         //--
         SapforPackage_json json = Utils_.jsonFromFile(sapforPackage.getJsonFile(), SapforPackage_json.class);
         LinkedHashMap<String, File> versions = new LinkedHashMap<>();
-        Vector<String> paths = new Vector<>();
+        LinkedHashMap<String, String> descriptions = new LinkedHashMap<>();
         for (SapforTask task : json.tasks) {
             if (task.state.equals(TaskState.Done)) {
                 File task_root = Paths.get(
@@ -647,16 +647,25 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                             task.test_description,
                             versionProject.getName()
                     );
-                    versions.put(String.join("_", name_parts), versionProject);
-                    paths.add(versionProject.getAbsolutePath());
+                    String name = String.join("_", name_parts);
+                    versions.put(name, versionProject);
+                    //--
+                    String[] data = task.codes.split(" ");
+                    Vector<String> codes_ = new Vector<>();
+                    for (String datum : data) {
+                        PassCode code = PassCode.valueOf(datum);
+                        codes_.add(code.getDescription());
+                        //--
+                        descriptions.put(name, String.join("\n", codes_));
+                    }
                 }
             }
         }
         ZipFolderPass zip = new ZipFolderPass();
         //создание тестов.
         Vector<Test> tests = new Vector<>();
-        for (String description : versions.keySet()) {
-            File src = versions.get(description);
+        for (String name : versions.keySet()) {
+            File src = versions.get(name);
             File[] files = src.listFiles(pathname -> !pathname.isDirectory());
             if (files != null && files.length > 0) {
                 //--
@@ -666,10 +675,11 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 //--
                 Test test = new Test();
                 test.group_id = group.id;
-                test.description = description;
+                test.description = name;
                 test.files = String.join("\n", filesNames);
                 test.sender_address = group.sender_address;
                 test.sender_name = group.sender_name;
+                test.extended_description = descriptions.get(name);
                 db.Insert(test);
                 //---
                 File testProject = new File(Global.TestsDirectory, String.valueOf(test.id));