no message

This commit is contained in:
2024-10-20 21:59:39 +03:00
parent 99643aa755
commit fda2940a79
95 changed files with 872 additions and 817 deletions

View File

@@ -1,7 +1,5 @@
package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
import Common.Database.Objects.DBObject;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
//конфгурация тестирования ДВМ
public class DVMConfiguration extends Configuration {
@@ -17,28 +15,4 @@ public class DVMConfiguration extends Configuration {
DVMConfiguration c = (DVMConfiguration) src;
c_maxtime = c.c_maxtime;
}
@Override
public Object getFieldAt(int columnIndex) {
ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(this);
switch (columnIndex) {
case 2:
return description;
case 3:
return sender_name;
case 4:
return kernels;
case 5:
return cache.settingsSummary;
case 6:
return cache.groupsSummary;
case 7:
return cache.getTestsCount();
case 8:
return c_maxtime;
case 9:
return maxtime;
default:
return null;
}
}
}

View File

@@ -4,6 +4,8 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import javax.swing.*;
@@ -29,6 +31,30 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
};
}
@Override
public Object getFieldAt(DVMConfiguration object, int columnIndex) {
ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(object);
switch (columnIndex) {
case 2:
return object.description;
case 3:
return object.sender_name;
case 4:
return object.kernels;
case 5:
return cache.settingsSummary;
case 6:
return cache.groupsSummary;
case 7:
return cache.getTestsCount();
case 8:
return object.c_maxtime;
case 9:
return object.maxtime;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() {
columns.get(6).setRendererClass(RendererMultiline.class);
columns.get(6).setMaxWidth(500);

View File

@@ -8,7 +8,6 @@ import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
@@ -19,7 +18,6 @@ import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import java.io.File;
import java.util.Date;
import java.util.Vector;
public class DVMPackage extends TestingPackage<DVMPackage_json> {
//---
@@ -112,35 +110,5 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
@Override
public void checkFinishState() throws Exception {
}
@Override
public Object getFieldAt(int columnIndex) {
PackageCache cache = (PackageCache) VisualCaches.GetCache(this);
switch (columnIndex) {
case 2:
return sender_name;
case 3:
return machine_address + ":" + machine_port;
case 4:
return user_name;
case 5:
return version;
case 6:
return cache.getConfigurationsDescriptions();
case 7:
return tasksCount;
case 8:
return kernels;
case 9:
return progress;
case 10:
return new Date(StartDate);
case 11:
return new Date(ChangeDate);
case 12:
return state;
default:
return null;
}
}
}

View File

@@ -7,7 +7,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMPackage.UI.DVMPackagesForm;
import javax.swing.*;
import java.util.Comparator;
public class DVMPackageDBTable extends iDBTable<DVMPackage> {
public static boolean filterMyOnly = false;
public static boolean filterActive = false;
@@ -30,7 +29,6 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DVMPackagesForm(this, mountPanel);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteDVMPackage;

View File

@@ -10,11 +10,14 @@ import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
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);
@@ -40,6 +43,36 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
};
}
@Override
public Object getFieldAt(DVMPackage object, int columnIndex) {
PackageCache cache = (PackageCache) VisualCaches.GetCache(object);
switch (columnIndex) {
case 2:
return object.sender_name;
case 3:
return object.machine_address + ":" + object.machine_port;
case 4:
return object.user_name;
case 5:
return object.version;
case 6:
return cache.getConfigurationsDescriptions();
case 7:
return object.tasksCount;
case 8:
return object.kernels;
case 9:
return object.progress;
case 10:
return new Date(object.StartDate);
case 11:
return new Date(object.ChangeDate);
case 12:
return object.state;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() {
columns.get(6).setRendererClass(RendererMultiline.class);
columns.get(9).setRendererClass(RendererProgressBar.class);
@@ -121,7 +154,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
}
@Override
public boolean isObjectVisible(DVMPackage object) {
return super.isObjectVisible(object)&&(!DVMPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
return super.isObjectVisible(object) && (!DVMPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
(!DVMPackageDBTable.filterActive || object.state.isActive());
}
}

View File

@@ -84,30 +84,5 @@ public class DVMSettings extends Settings {
public String getParamsText() {
return "Is_DVM_STAT=" + Is_DVM_STAT;
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return description;
case 3:
return sender_name;
case 4:
return flags;
case 5:
return environments;
case 6:
return printUsrPar();
case 7:
return cube;
case 8:
return max_proc_count;
case 9:
return min_dim_proc_count;
case 10:
return max_dim_proc_count;
default:
return null;
}
}
}

View File

@@ -3,12 +3,12 @@ import Common.Database.Objects.DBObject;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsForm;
import javax.swing.*;
public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
@@ -31,34 +31,7 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
//-
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"автор",
"флаги",
"окружение",
"usr.par",
"куб",
"max",
"min dim",
"max dim"
};
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishDVMSettings,
PassCode.CloneDVMSettings,
PassCode.EditDVMSettings,
PassCode.DeleteDVMSettings);
}
};
return new DVMSettingsForm(this, mountPanel);
}
@Override
public DBObjectDialog<DVMSettings, DVMSettingsFields> getDialog() {

View File

@@ -0,0 +1,64 @@
package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
import javax.swing.*;
public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
public DVMSettingsForm(DataSet<?, DVMSettings> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"автор",
"флаги",
"окружение",
"usr.par",
"куб",
"max",
"min dim",
"max dim"
};
}
@Override
public Object getFieldAt(DVMSettings object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description;
case 3:
return object.sender_name;
case 4:
return object.flags;
case 5:
return object.environments;
case 6:
return object.printUsrPar();
case 7:
return object.cube;
case 8:
return object.max_proc_count;
case 9:
return object.min_dim_proc_count;
case 10:
return object.max_dim_proc_count;
default:
return null;
}
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.PublishDVMSettings,
PassCode.CloneDVMSettings,
PassCode.EditDVMSettings,
PassCode.DeleteDVMSettings);
}
}

View File

@@ -128,36 +128,5 @@ public class DVMRunTask extends DVMTask {
public String getStatistic() {
return getResultFile(new File(getLocalWorkspace(), Constants.statistic + ".txt"));
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return test_description;
case 3:
return language;
case 4:
return flags;
case 5:
return compilation_state;
case 6:
return state;
case 7:
return matrix;
case 8:
return getEnvironments();
case 9:
return getUsrPar();
case 10:
return compilation_time;
case 11:
return Time;
case 12:
return CleanTime;
case 13:
return progress;
default:
return null;
}
}
}
//--

View File

@@ -6,7 +6,6 @@ import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMTasks.UI.DVMRunTasksForm;
import javax.swing.*;
import java.util.Comparator;
public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
//todo обобщить бы наличие фильтров для всех таблиц.
DVMPackage target;
@@ -56,5 +55,4 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
Data.clear();
target = null;
}
}

View File

@@ -39,6 +39,37 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
};
}
@Override
public Object getFieldAt(DVMRunTask object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.test_description;
case 3:
return object.language;
case 4:
return object.flags;
case 5:
return object.compilation_state;
case 6:
return object.state;
case 7:
return object.matrix;
case 8:
return object.getEnvironments();
case 9:
return object.getUsrPar();
case 10:
return object.compilation_time;
case 11:
return object.Time;
case 12:
return object.CleanTime;
case 13:
return object.progress;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() {
columns.get(5).setRendererClass(RendererStatusEnum.class);
columns.get(6).setRendererClass(RendererStatusEnum.class);
@@ -92,6 +123,6 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
}
@Override
public boolean isObjectVisible(DVMRunTask object) {
return super.isObjectVisible(object)&&Global.testingServer.db.dvmRunTasks.getUI().ApplyFilters(object);
return super.isObjectVisible(object) && Global.testingServer.db.dvmRunTasks.getUI().ApplyFilters(object);
}
}