From 3c9bc3f9b7ca595880b70997ce28195daee138be Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 28 Feb 2025 23:31:53 +0300
Subject: [PATCH] =?UTF-8?q?v++=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F=20=D0=B2?=
 =?UTF-8?q?=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                            | 18 ++++--------------
 .../Visual/Tables/RendererMilliseconds.java    | 16 ++++++++++++++++
 src/_VisualDVM/Constants.java                  |  2 +-
 .../Common/TestingPackage/TestingPackage.java  |  4 ++++
 .../DVM/DVMPackage/UI/DVMPackagesForm.java     | 16 ++++++++++++----
 .../SapforPackage/UI/SapforPackagesForm.java   | 15 +++++++++++----
 6 files changed, 48 insertions(+), 23 deletions(-)
 create mode 100644 src/Common/Visual/Tables/RendererMilliseconds.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 17006e12..d42e533a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,21 +7,11 @@
   </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/RendererMilliseconds.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/NormalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromSelectedFiles.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenCurrentProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveGraph.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveGraph.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Visual/Tables/RendererMilliseconds.java b/src/Common/Visual/Tables/RendererMilliseconds.java
new file mode 100644
index 00000000..44aed85b
--- /dev/null
+++ b/src/Common/Visual/Tables/RendererMilliseconds.java
@@ -0,0 +1,16 @@
+package Common.Visual.Tables;
+import Common.Utils.Utils_;
+
+import javax.swing.*;
+import java.util.Date;
+public class RendererMilliseconds extends RendererCell<Long>{
+    @Override
+    public Long Init(JTable table, Object value, int row, int column) {
+        return (Long) value;
+    }
+    @Override
+    public void Display() {
+        if (value != null)
+            setText(Utils_.printSplittedDateInterval(value));
+    }
+}
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index dc8bc819..4f848bda 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1186;
+    public static final int version = 1187;
     public static final int planner_version = 10;
     public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
     //--
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java b/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java
index 51409294..01ea66a4 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java
@@ -6,6 +6,7 @@ import Common.Utils.Utils_;
 import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
 import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationsJson;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
+import _VisualDVM.Utils;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.io.File;
@@ -23,6 +24,9 @@ public abstract class TestingPackage<J> extends riDBObject {
     public int progress = 0; //прогресс выполнения
     public long StartDate = 0;
     public long ChangeDate = 0;
+    public long getMilliseconds(){
+        return  ((StartDate!=0)&&(ChangeDate!=0))?ChangeDate-StartDate:0;
+    }
     @Description("DEFAULT 0")
     public int connectionErrosCount = 0;
     public TasksPackageState state = TasksPackageState.Draft;
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
index 55250b0a..4d47820c 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
@@ -1,14 +1,12 @@
 package _VisualDVM.TestingSystem.DVM.DVMPackage.UI;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
+import Common.Utils.Utils_;
 import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.FilterFlag;
 import Common.Visual.Menus.DataMenuBar;
-import Common.Visual.Tables.ColumnInfo;
-import Common.Visual.Tables.RendererDate;
-import Common.Visual.Tables.RendererProgressBar;
-import Common.Visual.Tables.RendererStatusEnum;
+import Common.Visual.Tables.*;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.PackageCache;
@@ -96,6 +94,16 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
                         return RendererDate.class;
                     }
                 },
+                new ColumnInfo<DVMPackage>("время") {
+                    @Override
+                    public Object getFieldAt(DVMPackage object) {
+                        return object.getMilliseconds();
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMilliseconds.class;
+                    }
+                },
                 new ColumnInfo<DVMPackage>("статус") {
                     @Override
                     public Object getFieldAt(DVMPackage object) {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
index 451a5f95..8dadbc18 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
@@ -5,10 +5,7 @@ import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.FilterFlag;
 import Common.Visual.Menus.DataMenuBar;
-import Common.Visual.Tables.ColumnInfo;
-import Common.Visual.Tables.RendererDate;
-import Common.Visual.Tables.RendererProgressBar;
-import Common.Visual.Tables.RendererStatusEnum;
+import Common.Visual.Tables.*;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.PackageCache;
@@ -84,6 +81,16 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
                         return RendererDate.class;
                     }
                 },
+                new ColumnInfo<SapforPackage>("время") {
+                    @Override
+                    public Object getFieldAt(SapforPackage object) {
+                        return object.getMilliseconds();
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMilliseconds.class;
+                    }
+                },
                 new ColumnInfo<SapforPackage>("различия") {
                     @Override
                     public Object getFieldAt(SapforPackage object) {