no message
This commit is contained in:
@@ -1,15 +1,14 @@
|
||||
package _VisualDVM.TestingSystem.DVM.DVMPackage;
|
||||
import Common.CommonConstants;
|
||||
import _VisualDVM.Current;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;
|
||||
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||
import _VisualDVM.GlobalData.Account.Account;
|
||||
import _VisualDVM.GlobalData.Compiler.Compiler;
|
||||
import _VisualDVM.GlobalData.Machine.Machine;
|
||||
import _VisualDVM.GlobalData.Machine.MachineType;
|
||||
import _VisualDVM.GlobalData.User.User;
|
||||
import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;
|
||||
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||
import _VisualDVM.TestingSystem.Common.TasksPackageState;
|
||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||
@@ -78,6 +77,10 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
|
||||
package_json = new DVMPackage_json(compilationTasks);
|
||||
saveConfigurationsAsJson(configurations);
|
||||
}
|
||||
public DVMPackage(DVMPackage p) {
|
||||
super(p);
|
||||
this.SynchronizeFields(p);
|
||||
}
|
||||
@Override
|
||||
public Class getJsonClass() {
|
||||
return DVMPackage_json.class;
|
||||
@@ -86,10 +89,6 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
|
||||
public File getHomeDirectory() {
|
||||
return Global.DVMPackagesDirectory;
|
||||
}
|
||||
public DVMPackage(DVMPackage p) {
|
||||
super(p);
|
||||
this.SynchronizeFields(p);
|
||||
}
|
||||
//---
|
||||
@Override
|
||||
public void SynchronizeFields(DBObject src) {
|
||||
@@ -115,7 +114,6 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
|
||||
}
|
||||
@Override
|
||||
public void checkFinishState() throws Exception {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package _VisualDVM.TestingSystem.DVM.DVMPackage;
|
||||
import _VisualDVM.Current;
|
||||
import Common.Database.Tables.iDBTable;
|
||||
import _VisualDVM.Global;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import _VisualDVM.Visual.UI;
|
||||
import _VisualDVM.Current;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.ServerObjectsCache.PackageCache;
|
||||
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.Visual.UI;
|
||||
|
||||
import java.util.Comparator;
|
||||
import java.util.Date;
|
||||
@@ -40,7 +40,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
|
||||
@Override
|
||||
protected void AdditionalInitColumns() {
|
||||
columns.get(6).setRenderer(RendererMultiline);
|
||||
// columns.get(7).setRenderer(RendererMultiline);
|
||||
// columns.get(7).setRenderer(RendererMultiline);
|
||||
columns.get(9).setRenderer(RendererProgress);
|
||||
columns.get(10).setRenderer(RendererDate);
|
||||
columns.get(11).setRenderer(RendererDate);
|
||||
@@ -64,7 +64,6 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
|
||||
public void MouseAction2() throws Exception {
|
||||
Global.mainModule.getPass(PassCode.DownloadDVMPackage).Do();
|
||||
}
|
||||
|
||||
};
|
||||
}
|
||||
@Override
|
||||
|
||||
@@ -11,11 +11,9 @@ public class DVMPackage_json implements Serializable {
|
||||
public int max_task_id = 0;
|
||||
@Expose
|
||||
public List<DVMCompilationTask> compilationTasks = new Vector<>();
|
||||
public int getMaxTaskId() {
|
||||
return max_task_id++;
|
||||
public DVMPackage_json() {
|
||||
}
|
||||
public DVMPackage_json(){}
|
||||
public DVMPackage_json(List<DVMCompilationTask> tasks){
|
||||
public DVMPackage_json(List<DVMCompilationTask> tasks) {
|
||||
for (DVMCompilationTask compilationTask : tasks) {
|
||||
compilationTask.id = getMaxTaskId();
|
||||
//-
|
||||
@@ -26,4 +24,7 @@ public class DVMPackage_json implements Serializable {
|
||||
}
|
||||
compilationTasks.addAll(tasks);
|
||||
}
|
||||
public int getMaxTaskId() {
|
||||
return max_task_id++;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package _VisualDVM.TestingSystem.DVM.DVMPackage;
|
||||
import Common.Utils.Utils_;
|
||||
import _VisualDVM.Global;
|
||||
import Common.Visual.Menus.DataMenuBar;
|
||||
import Common.Visual.Controls.MenuBarButton;
|
||||
import Common.Visual.Menus.DataMenuBar;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
|
||||
import javax.swing.*;
|
||||
@@ -11,7 +11,7 @@ public class DVMPackagesBar extends DataMenuBar {
|
||||
super("пакеты задач DVM");
|
||||
addPasses(PassCode.SynchronizeTests);
|
||||
addSeparator();
|
||||
addPasses(PassCode.AbortDVMPackage );
|
||||
addPasses(PassCode.AbortDVMPackage);
|
||||
addSeparator();
|
||||
addPasses(PassCode.DownloadDVMPackage,
|
||||
PassCode.ExportDVMPackageToExcel,
|
||||
|
||||
Reference in New Issue
Block a user