From 62e734f725774474d96df480078850aba75ef5d3 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 30 Oct 2024 19:33:52 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D1=83=D0=BF=D0=BE?=
 =?UTF-8?q?=D1=80=D1=8F=D0=B4=D0=BE=D1=87=D0=B8=D0=BB=20=D0=BA=D0=BE=D0=B4?=
 =?UTF-8?q?=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=B4=D0=B0=D1=82=20=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=86=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                 | 13 ++++++++++++-
 src/Common/Visual/Tables/RendererDate.java          |  9 ++++-----
 src/_VisualDVM/GlobalData/FileObject/DirInfo.java   |  6 +-----
 .../GlobalData/FileObject/UI/DirInfosForm.java      |  2 +-
 .../CompilationTask/UI/CompilationTasksForm.java    |  2 +-
 .../GlobalData/Tasks/RunTask/UI/RunTasksForm.java   |  2 +-
 .../Variants/UI/ParallelVariantsForm.java           |  2 +-
 .../Repository/BugReport/UI/BugReportsForm.java     |  4 ++--
 .../DVM/DVMPackage/UI/DVMPackagesForm.java          |  5 ++---
 .../SAPFOR/SapforPackage/UI/SapforPackagesForm.java |  5 ++---
 .../SAPFOR/ServerSapfor/UI/ServerSapforsForm.java   |  2 +-
 11 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e3aa1ef9..796c3521 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,18 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="" />
+    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererDate.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererDate.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.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" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/src/Common/Visual/Tables/RendererDate.java b/src/Common/Visual/Tables/RendererDate.java
index 82f95949..449cbc85 100644
--- a/src/Common/Visual/Tables/RendererDate.java
+++ b/src/Common/Visual/Tables/RendererDate.java
@@ -4,15 +4,14 @@ import Common.Utils.Utils_;
 import javax.swing.*;
 import java.util.Date;
 //название пересекается с встроенным классом поэтому подчеркивание.
-public class RendererDate extends RendererCell<Date> {
-    private static final Date zero = new Date(0);
+public class RendererDate extends RendererCell<Long> {
     @Override
-    public Date Init(JTable table, Object value, int row, int column) {
-        return (Date) value;
+    public Long Init(JTable table, Object value, int row, int column) {
+        return (Long) value;
     }
     @Override
     public void Display() {
         if (value != null)
-            setText(value.equals(zero) ? "нет" : Utils_.print_date(value));
+            setText((value == 0) ? "—" : Utils_.print_date(new Date(value)));
     }
 }
diff --git a/src/_VisualDVM/GlobalData/FileObject/DirInfo.java b/src/_VisualDVM/GlobalData/FileObject/DirInfo.java
index c2822da0..feb35860 100644
--- a/src/_VisualDVM/GlobalData/FileObject/DirInfo.java
+++ b/src/_VisualDVM/GlobalData/FileObject/DirInfo.java
@@ -2,10 +2,9 @@ package _VisualDVM.GlobalData.FileObject;
 import Common.Database.Objects.DBObject;
 
 import java.io.File;
-import java.util.Date;
 public class DirInfo extends DBObject {
+    public long mdate;
     File dir;
-    long mdate;
     public DirInfo(File dir_in, long mdate_in) {
         dir = dir_in;
         mdate = mdate_in;
@@ -14,9 +13,6 @@ public class DirInfo extends DBObject {
     public Object getPK() {
         return dir.getName();
     }
-    public Date getDate() {
-        return new Date(mdate);
-    }
     public File getFile() {
         return dir;
     }
diff --git a/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java b/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java
index 617f14a6..ff00781b 100644
--- a/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java
+++ b/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java
@@ -16,7 +16,7 @@ public class DirInfosForm extends DataSetControlForm<DirInfo> {
                 new ColumnInfo<DirInfo>("дата изменения") {
                     @Override
                     public Object getFieldAt(DirInfo object) {
-                        return object.getDate();
+                        return object.mdate;
                     }
                     @Override
                     public Class getRendererClass() {
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
index 45d466fe..04512f54 100644
--- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
@@ -84,7 +84,7 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
                 new ColumnInfo<CompilationTask>("Дата") {
                     @Override
                     public Object getFieldAt(CompilationTask object) {
-                        return object.getEndDate();
+                        return object.EndDate;
                     }
                     @Override
                     public Class getRendererClass() {
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
index 64616aaa..09907b6a 100644
--- a/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
@@ -50,7 +50,7 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
                 new ColumnInfo<RunTask>("Дата") {
                     @Override
                     public Object getFieldAt(RunTask object) {
-                        return object.getEndDate();
+                        return object.EndDate;
                     }
                     @Override
                     public Class getRendererClass() {
diff --git a/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java b/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
index 65283c60..e324a702 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
@@ -124,7 +124,7 @@ public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
                 new ColumnInfo<ParallelVariant>("Дата оценки") {
                     @Override
                     public Object getFieldAt(ParallelVariant object) {
-                        return object.stats.getPredictionDate();
+                        return object.stats.PredictionTime;
                     }
                     @Override
                     public Class getRendererClass() {
diff --git a/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java b/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
index c7c9d896..05c87ec1 100644
--- a/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
+++ b/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
@@ -74,7 +74,7 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
                 new ColumnInfo<BugReport>("Дата создания") {
                     @Override
                     public Object getFieldAt(BugReport object) {
-                        return object.getDate();
+                        return object.date;
                     }
                     @Override
                     public Class getRendererClass() {
@@ -84,7 +84,7 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
                 new ColumnInfo<BugReport>("Дата изменения") {
                     @Override
                     public Object getFieldAt(BugReport object) {
-                        return object.getChangeDate();
+                        return object.change_date;
                     }
                     @Override
                     public Class getRendererClass() {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
index 8868c6fe..0e92cbd5 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
@@ -14,7 +14,6 @@ import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 
 import javax.swing.*;
 import java.util.Comparator;
-import java.util.Date;
 public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
     public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
@@ -81,7 +80,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
                 new ColumnInfo<DVMPackage>("Начало") {
                     @Override
                     public Object getFieldAt(DVMPackage object) {
-                        return new Date(object.StartDate);
+                        return object.StartDate;
                     }
                     @Override
                     public Class getRendererClass() {
@@ -91,7 +90,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
                 new ColumnInfo<DVMPackage>("Изменено") {
                     @Override
                     public Object getFieldAt(DVMPackage object) {
-                        return new Date(object.ChangeDate);
+                        return object.ChangeDate;
                     }
                     @Override
                     public Class getRendererClass() {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
index a11d3cc4..882a7007 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
@@ -14,7 +14,6 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 
 import javax.swing.*;
 import java.util.Comparator;
-import java.util.Date;
 public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
     public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
@@ -69,7 +68,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
                 new ColumnInfo<SapforPackage>("Начало") {
                     @Override
                     public Object getFieldAt(SapforPackage object) {
-                        return new Date(object.StartDate);
+                        return object.StartDate;
                     }
                     @Override
                     public Class getRendererClass() {
@@ -79,7 +78,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
                 new ColumnInfo<SapforPackage>("Изменено") {
                     @Override
                     public Object getFieldAt(SapforPackage object) {
-                        return new Date(object.ChangeDate);
+                        return object.ChangeDate;
                     }
                     @Override
                     public Class getRendererClass() {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
index 082b4437..5be1dde7 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
@@ -34,7 +34,7 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
                 new ColumnInfo<ServerSapfor>("дата сборки") {
                     @Override
                     public Object getFieldAt(ServerSapfor object) {
-                        return object.getBuildDate();
+                        return object.buildDate;
                     }
                     @Override
                     public Class getRendererClass() {