перенос метода получающего поле объекта для отображения

This commit is contained in:
2024-10-20 13:34:38 +03:00
parent dc53ecd6c8
commit f13a9cda2e
76 changed files with 721 additions and 612 deletions

View File

@@ -111,4 +111,19 @@ public class Group extends riDBObject {
"\t" + Utils.MFVar("LINK_COMMAND") + " " + Utils.MFVar("LINK_FLAGS") + " " + String.join(" ", objects) + " -o " + binary,
String.join(" ", bodies));
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return description;
case 3:
return sender_name;
case 4:
return type.getDescription();
case 5:
return language.getDescription();
default:
return null;
}
}
}

View File

@@ -120,21 +120,6 @@ public class GroupsDBTable extends iDBTable<Group> {
};
}
@Override
public Object getFieldAt(Group object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description;
case 3:
return object.sender_name;
case 4:
return object.type.getDescription();
case 5:
return object.language.getDescription();
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.Group;
}

View File

@@ -131,4 +131,20 @@ public class Test extends riDBObject {
}
return res;
}
//-
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return description;
case 3:
return min_dim;
case 4:
return max_dim;
case 5:
return getFilesForTable();
default:
return null;
}
}
}

View File

@@ -56,21 +56,7 @@ public class TestDBTable extends iDBTable<Test> {
}
};
}
@Override
public Object getFieldAt(Test object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description;
case 3:
return object.min_dim;
case 4:
return object.max_dim;
case 5:
return object.getFilesForTable();
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.Test;

View File

@@ -1,5 +1,7 @@
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 {
@@ -15,4 +17,28 @@ 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

@@ -67,30 +67,7 @@ public class DVMConfigurationDBTable extends iDBTable<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
public DBObjectDialog<DVMConfiguration, ConfigurationFields> getDialog() {
return new DBObjectDialog<DVMConfiguration, ConfigurationFields>(ConfigurationFields.class) {

View File

@@ -8,6 +8,7 @@ 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;
@@ -18,6 +19,7 @@ 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> {
//---
@@ -115,5 +117,35 @@ 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

@@ -133,36 +133,6 @@ public class DVMPackageDBTable extends iDBTable<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
public Comparator<DVMPackage> getComparator() {
return new Comparator<DVMPackage>() {
@Override

View File

@@ -84,5 +84,30 @@ 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

@@ -28,31 +28,7 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
return "параметры тестирования";
}
//--
@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
protected DataSetControlForm createUI(JPanel mountPanel) {

View File

@@ -132,5 +132,36 @@ 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

@@ -96,37 +96,7 @@ public class DVMRunTasksSet extends DataSet<Integer, 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
public Current CurrentName() {
return Current.DVMRunTask;

View File

@@ -1,6 +1,7 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
import Common.Utils.TextLog;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
@@ -41,4 +42,26 @@ public class SapforConfiguration extends Configuration {
//-
return Log.isEmpty();
}
@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 printAuto();
case 5:
return kernels;
case 6:
return cache.settingsSummary;
case 7:
return cache.groupsSummary;
case 8:
return cache.getTestsCount();
default:
return null;
}
}
}

View File

@@ -73,28 +73,7 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
}
};
}
@Override
public Object getFieldAt(SapforConfiguration 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.printAuto();
case 5:
return object.kernels;
case 6:
return cache.settingsSummary;
case 7:
return cache.groupsSummary;
case 8:
return cache.getTestsCount();
default:
return null;
}
}
//--
@Override
public DBObjectDialog<SapforConfiguration, SapforConfigurationFields> getDialog() {

View File

@@ -7,6 +7,7 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.Account;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -17,6 +18,7 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import java.io.File;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Vector;
public class SapforPackage extends TestingPackage<SapforPackage_json> {
@@ -118,4 +120,30 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
description = "Выполнено на " + ((int) percent) + "%\n" +
"Всего задач: " + tasksCount + ", из них с ошибками " + bad;
}
@Override
public Object getFieldAt(int columnIndex) {
PackageCache cache = (PackageCache) VisualCaches.GetCache(this);
switch (columnIndex) {
case 2:
return sender_name;
case 3:
return version;
case 4:
return cache.getConfigurationsDescriptions();
case 5:
return tasksCount;
case 6:
return kernels;
case 7:
return progress;
case 8:
return new Date(StartDate);
case 9:
return new Date(ChangeDate);
case 10:
return state;
default:
return null;
}
}
}

View File

@@ -115,32 +115,7 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
}
};
}
@Override
public Object getFieldAt(SapforPackage object, int columnIndex) {
PackageCache cache = (PackageCache) VisualCaches.GetCache(object);
switch (columnIndex) {
case 2:
return object.sender_name;
case 3:
return object.version;
case 4:
return cache.getConfigurationsDescriptions();
case 5:
return object.tasksCount;
case 6:
return object.kernels;
case 7:
return object.progress;
case 8:
return new Date(object.StartDate);
case 9:
return new Date(object.ChangeDate);
case 10:
return object.state;
default:
return null;
}
}
@Override
public Comparator<SapforPackage> getComparator() {
return new Comparator<SapforPackage>() {

View File

@@ -102,4 +102,17 @@ public class SapforSettings extends Settings {
//-
return res;
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return description;
case 3:
return sender_name;
case 4:
return flags;
default:
return null;
}
}
}

View File

@@ -57,19 +57,6 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
}
};
}
@Override
public Object getFieldAt(SapforSettings object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description;
case 3:
return object.sender_name;
case 4:
return object.flags;
default:
return null;
}
}
//-
@Override
public DBObjectDialog<SapforSettings, SapforSettingsFields> getDialog() {

View File

@@ -26,4 +26,13 @@ public class SapforSettingsCommand extends riDBObject {
sapforsettings_id = c.sapforsettings_id;
passCode = c.passCode;
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return passCode.getDescription();
default:
return null;
}
}
}

View File

@@ -25,15 +25,7 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
public String getPluralDescription() {
return "команды";
}
@Override
public Object getFieldAt(SapforSettingsCommand object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.passCode.getDescription();
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.SapforSettingsCommand;

View File

@@ -47,4 +47,18 @@ public class ServerSapfor extends riDBObject {
public String getVersionCommand() {
return Utils_.DQuotes(call_command) + " " + version_command;
}
@Override
public Object getFieldAt( int columnIndex) {
switch (columnIndex) {
case 2:
return version;
case 3:
return sender_name;
case 4:
return getBuildDate();
case 5:
return state;
}
return null;
}
}

View File

@@ -27,20 +27,7 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
public Current CurrentName() {
return Current.ServerSapfor;
}
@Override
public Object getFieldAt(ServerSapfor object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.version;
case 3:
return object.sender_name;
case 4:
return object.getBuildDate();
case 5:
return object.state;
}
return null;
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {