время выполнения пакетов
This commit is contained in:
2025-02-28 23:31:53 +03:00
parent d019beff5f
commit 3c9bc3f9b7
6 changed files with 48 additions and 23 deletions

18
.idea/workspace.xml generated
View File

@@ -7,21 +7,11 @@
</component> </component>
<component name="ChangeListManager"> <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 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$/.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/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/NormalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.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/Passes/All/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.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/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" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

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

View File

@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
import java.util.Vector; import java.util.Vector;
public class Constants { 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 planner_version = 10;
public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины. public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
//-- //--

View File

@@ -6,6 +6,7 @@ import Common.Utils.Utils_;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration; import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationsJson; import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationsJson;
import _VisualDVM.TestingSystem.Common.TasksPackageState; import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.Utils;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
import java.io.File; import java.io.File;
@@ -23,6 +24,9 @@ public abstract class TestingPackage<J> extends riDBObject {
public int progress = 0; //прогресс выполнения public int progress = 0; //прогресс выполнения
public long StartDate = 0; public long StartDate = 0;
public long ChangeDate = 0; public long ChangeDate = 0;
public long getMilliseconds(){
return ((StartDate!=0)&&(ChangeDate!=0))?ChangeDate-StartDate:0;
}
@Description("DEFAULT 0") @Description("DEFAULT 0")
public int connectionErrosCount = 0; public int connectionErrosCount = 0;
public TasksPackageState state = TasksPackageState.Draft; public TasksPackageState state = TasksPackageState.Draft;

View File

@@ -1,14 +1,12 @@
package _VisualDVM.TestingSystem.DVM.DVMPackage.UI; package _VisualDVM.TestingSystem.DVM.DVMPackage.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton; import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.FilterFlag; import Common.Visual.FilterFlag;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo; import Common.Visual.Tables.*;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache; import _VisualDVM.ServerObjectsCache.PackageCache;
@@ -96,6 +94,16 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
return RendererDate.class; 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>("статус") { new ColumnInfo<DVMPackage>("статус") {
@Override @Override
public Object getFieldAt(DVMPackage object) { public Object getFieldAt(DVMPackage object) {

View File

@@ -5,10 +5,7 @@ import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.FilterFlag; import Common.Visual.FilterFlag;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo; import Common.Visual.Tables.*;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache; import _VisualDVM.ServerObjectsCache.PackageCache;
@@ -84,6 +81,16 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
return RendererDate.class; 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>("различия") { new ColumnInfo<SapforPackage>("различия") {
@Override @Override
public Object getFieldAt(SapforPackage object) { public Object getFieldAt(SapforPackage object) {