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 @@
+
-
-
+
+
+
+
+
+
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 {
}
@Override
public int getDefaultHeight() {
- return 200;
+ return 400;
}
@Override
public int getDefaultWidth() {
@@ -31,10 +31,12 @@ public class TestDialog extends DBObjectDialog {
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 {
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 @@
-
+
@@ -34,7 +34,7 @@
-
+
@@ -43,7 +43,7 @@
-
+
@@ -52,7 +52,7 @@
-
+
@@ -61,13 +61,34 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 {
@@ -26,6 +31,20 @@ public class TestsForm extends DataSetControlForm {
return object.description;
}
},
+ new ColumnInfo("описание") {
+ @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("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 {
//--
SapforPackage_json json = Utils_.jsonFromFile(sapforPackage.getJsonFile(), SapforPackage_json.class);
LinkedHashMap versions = new LinkedHashMap<>();
- Vector paths = new Vector<>();
+ LinkedHashMap 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 {
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 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 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 {
//--
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));