From be1fbe3ddb84a07efc6a69360729bca6dfbe378c Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 14 Nov 2023 23:07:49 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  6 +--
 properties                                    |  2 +-
 src/Repository/Component/Visualiser.java      |  2 +-
 .../SapforConfigurationDBTable.java           | 12 +++---
 .../UI/SapforConfigurationFields.form         | 37 ++++---------------
 .../UI/SapforConfigurationFields.java         |  6 ---
 .../SapforConfigurationCommandsDBTable.java   |  7 +++-
 .../SapforTasksPackagesDBTable.java           |  1 +
 .../ServerSapfor/ServerSapforsDBTable.java    |  2 +-
 .../UI/ConfigurationDBTable.java              |  2 +-
 src/TestingSystem/Group/GroupsDBTable.java    |  2 +-
 .../TasksPackage/TasksPackageDBTable.java     |  1 +
 src/TestingSystem/Test/TestDBTable.java       |  2 +-
 13 files changed, 30 insertions(+), 52 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8fdbd6ca..3d84e517 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -48,10 +48,10 @@
     </file-type-list>
   </component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/src/TestingSystem/TestingServer.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishGroup.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishGroup.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/TestingSystem/TestingServer.java" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="KotlinCodeInsightWorkspaceSettings">
     <option name="optimizeImportsOnTheFly" value="true" />
diff --git a/properties b/properties
index d9a7bdd4..eefc1a58 100644
--- a/properties
+++ b/properties
@@ -25,7 +25,7 @@
   "InstructionPath": "",
   "PerformanceAnalyzerPath": "",
   "ComponentsBackUpsCount": 10,
-  "TestingKernels": 14,
+  "TestingKernels": 64,
   "AutoCheckTesting": false,
   "CheckTestingIntervalSeconds": 15,
   "EmailOnTestingProgress": true
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index eb13f009..2ac9acf7 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 = 1026;
+        version = 1027;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java b/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java
index 0600f8f4..b4eb25c4 100644
--- a/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java
@@ -32,6 +32,10 @@ public class SapforConfigurationDBTable extends DBTable<String, SapforConfigurat
                 return true;
             }
             @Override
+            protected void AdditionalInitColumns() {
+                columns.get(0).setVisible(false);
+            }
+            @Override
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
                // Global.db.sapforTasksPackages.ShowUI();
@@ -48,8 +52,7 @@ public class SapforConfigurationDBTable extends DBTable<String, SapforConfigurat
         return new String[]{
                 "имя",
                 "автор",
-                "флаги",
-                "maxtime"
+                "флаги"
         };
     }
     @Override
@@ -61,8 +64,6 @@ public class SapforConfigurationDBTable extends DBTable<String, SapforConfigurat
                 return object.sender_name;
             case 4:
                 return SapforConfigurationInterface.getFlags(object);
-            case 5:
-                return object.maxtime;
             default:
                 return null;
         }
@@ -90,12 +91,10 @@ public class SapforConfigurationDBTable extends DBTable<String, SapforConfigurat
                 fields.cbKEEP_SPF_DIRECTIVES.setSelected(Result.KEEP_SPF_DIRECTIVES != 0);
                 fields.cbSTATIC_SHADOW_ANALYSIS.setSelected(Result.STATIC_SHADOW_ANALYSIS != 0);
                 fields.sMAX_SHADOW_WIDTH.setValue(Result.MAX_SHADOW_WIDTH);
-                fields.sMaxtime.setValue(Result.maxtime);
             }
             @Override
             public void ProcessResult() {
                 Result.description = fields.tfName.getText();
-                Result.maxtime = (int) fields.sMaxtime.getValue();
                 // Result.transformations = ((StyledStringList) (fields.transformationsList)).pack();
                 Result.FREE_FORM = Utils.fromBoolean(fields.cbFREE_FORM.isSelected());
                 Result.KEEP_DVM_DIRECTIVES = Utils.fromBoolean(fields.cbKEEP_DVM_DIRECTIVES.isSelected());
@@ -106,7 +105,6 @@ public class SapforConfigurationDBTable extends DBTable<String, SapforConfigurat
             @Override
             public void SetReadonly() {
                 fields.tfName.setEnabled(false);
-                fields.sMaxtime.setEnabled(false);
                 fields.sTransformationMaxtime.setEnabled(false);
             }
         };
diff --git a/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form b/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form
index 144b027a..6fbe7da9 100644
--- a/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form
+++ b/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form
@@ -8,7 +8,7 @@
     <properties/>
     <border type="none"/>
     <children>
-      <grid id="d1d6e" layout-manager="GridLayoutManager" row-count="9" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="d1d6e" layout-manager="GridLayoutManager" row-count="8" 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>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -29,7 +29,7 @@
           </component>
           <vspacer id="224d6">
             <constraints>
-              <grid row="8" 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="7" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false">
                 <preferred-size width="284" height="14"/>
               </grid>
             </constraints>
@@ -44,30 +44,9 @@
             </constraints>
             <properties/>
           </component>
-          <component id="3e6be" 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">
-                <preferred-size width="284" height="20"/>
-              </grid>
-            </constraints>
-            <properties>
-              <font name="Times New Roman" size="16" style="2"/>
-              <text value="макс. время прохода"/>
-            </properties>
-          </component>
-          <component id="db389" class="javax.swing.JSpinner" binding="sMaxtime">
-            <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">
-                <minimum-size width="100" height="30"/>
-                <preferred-size width="240" height="30"/>
-                <maximum-size width="100" height="30"/>
-              </grid>
-            </constraints>
-            <properties/>
-          </component>
           <component id="b644a" class="javax.swing.JCheckBox" binding="cbFREE_FORM">
             <constraints>
-              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false">
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false">
                 <preferred-size width="284" height="25"/>
               </grid>
             </constraints>
@@ -80,7 +59,7 @@
           </component>
           <component id="7721e" class="javax.swing.JCheckBox" binding="cbKEEP_SPF_DIRECTIVES">
             <constraints>
-              <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false">
+              <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false">
                 <preferred-size width="284" height="25"/>
               </grid>
             </constraints>
@@ -93,7 +72,7 @@
           </component>
           <component id="f44c1" class="javax.swing.JLabel">
             <constraints>
-              <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="3" use-parent-layout="false">
+              <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="3" use-parent-layout="false">
                 <preferred-size width="284" height="17"/>
               </grid>
             </constraints>
@@ -104,7 +83,7 @@
           </component>
           <component id="54e77" class="javax.swing.JCheckBox" binding="cbSTATIC_SHADOW_ANALYSIS">
             <constraints>
-              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false">
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false">
                 <preferred-size width="284" height="25"/>
               </grid>
             </constraints>
@@ -117,7 +96,7 @@
           </component>
           <component id="4e865" class="javax.swing.JCheckBox" binding="cbKEEP_DVM_DIRECTIVES">
             <constraints>
-              <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false">
+              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false">
                 <preferred-size width="284" height="25"/>
               </grid>
             </constraints>
@@ -130,7 +109,7 @@
           </component>
           <component id="14243" class="javax.swing.JSlider" binding="sMAX_SHADOW_WIDTH">
             <constraints>
-              <grid row="7" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="6" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <minimum-size width="500" height="40"/>
                 <preferred-size width="500" height="40"/>
                 <maximum-size width="500" height="40"/>
diff --git a/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java b/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java
index c00d0f14..15a1f5c0 100644
--- a/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java
+++ b/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java
@@ -7,7 +7,6 @@ import java.awt.*;
 public class SapforConfigurationFields implements DialogFields {
     private JPanel content;
     public JTextField tfName;
-    public JSpinner sMaxtime;
     public JSpinner sTransformationMaxtime;
     public JCheckBox cbFREE_FORM;
     public JSlider sMAX_SHADOW_WIDTH;
@@ -23,9 +22,4 @@ public class SapforConfigurationFields implements DialogFields {
         // TODO: place custom component creation code here
         tfName = new StyledTextField();
     }
-    public SapforConfigurationFields(){
-        sMaxtime.setModel(new SpinnerNumberModel(40,
-                5, 3600, 1
-        ));
-    }
 }
diff --git a/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java b/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
index be124155..98a03d5f 100644
--- a/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
+++ b/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
@@ -20,7 +20,12 @@ public class SapforConfigurationCommandsDBTable extends DBTable<String, SapforCo
     }
     @Override
     protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this);
+        return new DataSetControlForm(this){
+            @Override
+            protected void AdditionalInitColumns() {
+                columns.get(0).setVisible(false);
+            }
+        };
     }
     @Override
     public String[] getUIColumnNames() {
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
index ec6500ca..57351b99 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
@@ -30,6 +30,7 @@ public class SapforTasksPackagesDBTable extends DBTable<String, SapforTasksPacka
         return new DataSetControlForm(this) {
             @Override
             protected void AdditionalInitColumns() {
+                columns.get(0).setVisible(false);
                 columns.get(5).setRenderer(RendererDate);
                 columns.get(6).setRenderer(RendererDate);
                 columns.get(7).setRenderer(RendererStatusEnum);
diff --git a/src/SapforTestingSystem/ServerSapfor/ServerSapforsDBTable.java b/src/SapforTestingSystem/ServerSapfor/ServerSapforsDBTable.java
index faccf58b..33d38e0d 100644
--- a/src/SapforTestingSystem/ServerSapfor/ServerSapforsDBTable.java
+++ b/src/SapforTestingSystem/ServerSapfor/ServerSapforsDBTable.java
@@ -38,7 +38,7 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
         return new DataSetControlForm(this) {
             @Override
             protected void AdditionalInitColumns() {
-                //columns.get(0).setVisible(false);
+                columns.get(0).setVisible(false);
                 columns.get(2).setRenderer(TableRenderers.RendererDate);
             }
         };
diff --git a/src/TestingSystem/Configuration/UI/ConfigurationDBTable.java b/src/TestingSystem/Configuration/UI/ConfigurationDBTable.java
index ce39df16..d51d2f57 100644
--- a/src/TestingSystem/Configuration/UI/ConfigurationDBTable.java
+++ b/src/TestingSystem/Configuration/UI/ConfigurationDBTable.java
@@ -34,7 +34,7 @@ public class ConfigurationDBTable extends DBTable<String, Configuration> {
             }
             @Override
             protected void AdditionalInitColumns() {
-                //    columns.get(0).setVisible(false);
+                columns.get(0).setVisible(false);
                 columns.get(4).setRenderer(TableRenderers.RendererMultiline);
                 columns.get(5).setRenderer(TableRenderers.RendererMultiline);
                 columns.get(12).setRenderer(TableRenderers.RendererMultiline);
diff --git a/src/TestingSystem/Group/GroupsDBTable.java b/src/TestingSystem/Group/GroupsDBTable.java
index 26f11e1d..67b1f5d5 100644
--- a/src/TestingSystem/Group/GroupsDBTable.java
+++ b/src/TestingSystem/Group/GroupsDBTable.java
@@ -122,7 +122,7 @@ public class GroupsDBTable extends DBTable<String, Group> {
             }
             @Override
             protected void AdditionalInitColumns() {
-                //columns.get(0).setVisible(false);
+                columns.get(0).setVisible(false);
             }
         };
     }
diff --git a/src/TestingSystem/TasksPackage/TasksPackageDBTable.java b/src/TestingSystem/TasksPackage/TasksPackageDBTable.java
index d0359db3..db0cb4e7 100644
--- a/src/TestingSystem/TasksPackage/TasksPackageDBTable.java
+++ b/src/TestingSystem/TasksPackage/TasksPackageDBTable.java
@@ -36,6 +36,7 @@ public class TasksPackageDBTable extends DBTable<String, TasksPackage> {
             }
             @Override
             protected void AdditionalInitColumns() {
+                columns.get(0).setVisible(false);
                 columns.get(7).setRenderer(RendererDate);
                 columns.get(8).setRenderer(RendererDate);
                 columns.get(9).setRenderer(RendererStatusEnum);
diff --git a/src/TestingSystem/Test/TestDBTable.java b/src/TestingSystem/Test/TestDBTable.java
index f3dd4c8a..17758b1d 100644
--- a/src/TestingSystem/Test/TestDBTable.java
+++ b/src/TestingSystem/Test/TestDBTable.java
@@ -21,7 +21,7 @@ public class TestDBTable extends DBTable<String, Test> {
         return new DataSetControlForm(this) {
             @Override
             protected void AdditionalInitColumns() {
-                //columns.get(0).setVisible(false);
+                columns.get(0).setVisible(false);
             }
             @Override
             public boolean hasCheckBox() {