M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

промежуточный. упорядочил код отображения дат в таблицах

Browse Source
This commit is contained in:
02090095
2024-10-30 19:33:52 +03:00
parent 2712b904b1
commit 62e734f725
11 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/workspace.xml generated
View File

@@ -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" />

9
src/Common/Visual/Tables/RendererDate.java
View File

@@ -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)));
}
}

6
src/_VisualDVM/GlobalData/FileObject/DirInfo.java
View File

@@ -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;
}

2
src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java
View File

@@ -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() {

2
src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
View File

@@ -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() {

2
src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
View File

@@ -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() {

2
src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
View File

@@ -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() {

4
src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
View File

@@ -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() {

5
src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
View File

@@ -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() {

5
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
View File

@@ -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() {

2
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
View File

@@ -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() {