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-20 13:34:38 +03:00
parent dc53ecd6c8
commit f13a9cda2e
76 changed files with 721 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/_VisualDVM/GlobalData/Compiler/Compiler.java
View File

@@ -191,4 +191,19 @@ public class Compiler extends iDBObject {
public String getVersionInfo() {
return "v=" + version + " r=" + revision;
}
//
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return description;
case 3:
return call_command;
case 4:
return version;
case 5:
return revision;
}
return null;
}
}

14
src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -159,20 +159,6 @@ public class CompilersDBTable extends iDBTable<Compiler> {
};
}
@Override
public Object getFieldAt(Compiler object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description;
case 3:
return object.call_command;
case 4:
return object.version;
case 5:
return object.revision;
}
return null;
}
@Override
public Current CurrentName() {
return Current.Compiler;
}

11
src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironment.java
View File

@@ -73,4 +73,15 @@ public class CompilerEnvironment extends DBObject {
}
}
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return value;
case 3:
return description;
default:
return null;
}
}
}

11
src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java
View File

@@ -11,17 +11,6 @@ public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment
super(String.class, CompilerEnvironment.class);
}
@Override
public Object getFieldAt(CompilerEnvironment object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.value;
case 3:
return object.description;
default:
return null;
}
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override

13
src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java
View File

@@ -45,4 +45,17 @@ public class CompilerOption extends DBObject {
}
return false;
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return parameterName + parameterSeparator;
case 3:
return parameterValue;
case 4:
return description;
default:
return null;
}
}
}

13
src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java
View File

@@ -11,19 +11,6 @@ public class CompilerOptionsSet extends DataSet<String, CompilerOption> {
super(String.class, CompilerOption.class);
}
@Override
public Object getFieldAt(CompilerOption object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.parameterName + object.parameterSeparator;
case 3:
return object.parameterValue;
case 4:
return object.description;
default:
return null;
}
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override

10
src/_VisualDVM/GlobalData/DVMParameter/DVMParameter.java
View File

@@ -5,4 +5,14 @@ public class DVMParameter extends EnvironmentValue {
public String toString() {
return name + "=" + value + ";";
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return name;
case 2:
return value;
}
return null;
}
}

10
src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
View File

@@ -26,16 +26,6 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
return "параметры DVM";
}
@Override
public Object getFieldAt(DVMParameter object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.name;
case 2:
return object.value;
}
return null;
}
@Override
public Current CurrentName() {
return Current.DVMParameterValue;
}

11
src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java
View File

@@ -17,4 +17,15 @@ public class EnvironmentValue extends iDBObject {
public String toString() {
return name + "=" + Utils_.DQuotes(value);
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return name;
case 2:
return value;
}
return null;
}
}

10
src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
View File

@@ -92,16 +92,6 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
};
}
@Override
public Object getFieldAt(EnvironmentValue object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.name;
case 2:
return object.value;
}
return null;
}
@Override
public Current CurrentName() {
return Current.EnvironmentValue;
}

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

@@ -20,4 +20,14 @@ public class DirInfo extends DBObject {
public File getFile() {
return dir;
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return getDate();
default:
return null;
}
}
}

9
src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java
View File

@@ -22,13 +22,4 @@ public class DirInfosDataSet extends DataSet<String, DirInfo> {
}
};
}
@Override
public Object getFieldAt(DirInfo object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.getDate();
default:
return null;
}
}
}

10
src/_VisualDVM/GlobalData/Machine/Machine.java
View File

@@ -63,4 +63,14 @@ public class Machine extends iDBObject {
"--help"
));
*/
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return getURL();
default:
return null;
}
}
}

9
src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
View File

@@ -140,15 +140,6 @@ public class MachinesDBTable extends iDBTable<Machine> {
};
}
@Override
public Object getFieldAt(Machine object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.getURL();
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.Machine;
}

14
src/_VisualDVM/GlobalData/Makefile/Makefile.java
View File

@@ -200,4 +200,18 @@ public class Makefile extends ModuleAnchestor {
}
}
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return getCompilerDescription();
case 3:
return command;
case 4:
return flags;
default:
return null;
}
}
}

13
src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
View File

@@ -75,19 +75,6 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
};
}
@Override
public Object getFieldAt(Makefile object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.getCompilerDescription();
case 3:
return object.command;
case 4:
return object.flags;
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.Makefile;
}

15
src/_VisualDVM/GlobalData/Module/Module.java
View File

@@ -35,4 +35,19 @@ public class Module extends ModuleAnchestor {
Utils_.MainLog.PrintException(e);
}
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return language.getDescription();
case 3:
return getCompilerDescription();
case 4:
return command;
case 5:
return flags;
default:
return null;
}
}
}

15
src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
View File

@@ -52,21 +52,6 @@ public class ModulesDBTable extends iDBTable<Module> {
};
}
@Override
public Object getFieldAt(Module object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.language.getDescription();
case 3:
return object.getCompilerDescription();
case 4:
return object.command;
case 5:
return object.flags;
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.Module;
}

22
src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java
View File

@@ -256,4 +256,26 @@ public class RunConfiguration extends iDBObject {
}
return res;
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return LauncherCall;
case 2:
return LauncherOptions;
case 3:
return dim;
case 4:
return printCube();
case 5:
return minMatrix;
case 6:
return maxMatrix;
case 7:
return args;
default:
return null;
}
}
}

21
src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
View File

@@ -152,27 +152,6 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
};
}
@Override
public Object getFieldAt(RunConfiguration object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.LauncherCall;
case 2:
return object.LauncherOptions;
case 3:
return object.dim;
case 4:
return object.printCube();
case 5:
return object.minMatrix;
case 6:
return object.maxMatrix;
case 7:
return object.args;
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.RunConfiguration;
}

14
src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java
View File

@@ -1,9 +1,23 @@
package _VisualDVM.GlobalData.SapforProfile;
import Common.Database.Objects.iDBObject;
import com.sun.org.glassfish.gmbal.Description;
import java.util.Date;
public class SapforProfile extends iDBObject {
@Description("DEFAULT ''")
public String description = "";
@Description("DEFAULT 0")
public long creationDate = 0;
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return description;
case 3:
return new Date(creationDate);
default:
return null;
}
}
}

11
src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
View File

@@ -53,17 +53,6 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
};
}
@Override
public Object getFieldAt(SapforProfile object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description;
case 3:
return new Date(object.creationDate);
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.SapforProfile;
}

11
src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSetting.java
View File

@@ -16,4 +16,15 @@ public class SapforProfileSetting extends iDBObject {
public boolean isVisible() {
return Global.mainModule.matchCurrentID(Current.SapforProfile, sapforprofile_id);
}
@Override
public Object getFieldAt( int columnIndex) {
switch (columnIndex) {
case 1:
return name.getDescription();
case 2:
return value;
default:
return null;
}
}
}

11
src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java
View File

@@ -32,15 +32,4 @@ public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting>
public Current CurrentName() {
return Current.SapforProfileSetting;
}
@Override
public Object getFieldAt(SapforProfileSetting object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.name.getDescription();
case 2:
return object.value;
default:
return null;
}
}
}

33
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java
View File

@@ -112,4 +112,37 @@ public class CompilationTask extends Task {
public String getFKName() {
return "compilation_task_id";
}
//-
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return linkerDescription;
case 3:
return linkFlags;
case 4:
return fortranCompilerDescription;
case 5:
return fortranFlags;
case 6:
return cCompilerDescription;
case 7:
return cFlags;
case 8:
return cppCompilerDescription;
case 9:
return cppFlags;
case 10:
return maxtime;
case 11:
return Time;
case 12:
return getEndDate();
case 13:
return state;
default:
return null;
}
}
}

31
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
View File

@@ -80,37 +80,6 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
};
}
@Override
public Object getFieldAt(CompilationTask object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.linkerDescription;
case 3:
return object.linkFlags;
case 4:
return object.fortranCompilerDescription;
case 5:
return object.fortranFlags;
case 6:
return object.cCompilerDescription;
case 7:
return object.cFlags;
case 8:
return object.cppCompilerDescription;
case 9:
return object.cppFlags;
case 10:
return object.maxtime;
case 11:
return object.Time;
case 12:
return object.getEndDate();
case 13:
return object.state;
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.CompilationTask;
}

20
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java
View File

@@ -158,4 +158,24 @@ public class RunTask extends Task {
!config.getParList().isEmpty()
;
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return matrix;
case 3:
return maxtime;
case 4:
return Time;
case 5:
return CleanTime;
case 6:
return getEndDate();
case 7:
return state;
default:
return null;
}
}
}

19
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
View File

@@ -61,25 +61,6 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
};
}
@Override
public Object getFieldAt(RunTask object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.matrix;
case 3:
return object.maxtime;
case 4:
return object.Time;
case 5:
return object.CleanTime;
case 6:
return object.getEndDate();
case 7:
return object.state;
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.RunTask;
}

12
src/_VisualDVM/GlobalData/User/User.java
View File

@@ -76,4 +76,16 @@ public class User extends iDBObject {
public File getLauncherFile() {
return Paths.get(workspace, "modules", "launcher").toFile();
}
//-
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return login;
case 3:
return state;
default:
return null;
}
}
}

11
src/_VisualDVM/GlobalData/User/UsersDBTable.java
View File

@@ -114,17 +114,6 @@ public class UsersDBTable extends iDBTable<User> {
};
}
@Override
public Object getFieldAt(User object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.login;
case 3:
return object.state;
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.User;
}

11
src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
View File

@@ -45,17 +45,6 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
};
}
@Override
public Object getFieldAt(DBArray array, int columnIndex) {
switch (columnIndex) {
case 1:
return array.State;
case 2:
return array.shortName;
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.DBArray;
}

12
src/_VisualDVM/ProjectData/DBArray/DBArray.java
View File

@@ -25,4 +25,16 @@ public class DBArray extends DBObject {
public ImageIcon GetSelectionIcon() {
return State.GetIcon();
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return State;
case 2:
return shortName;
default:
return null;
}
}
}

13
src/_VisualDVM/ProjectData/Messages/Message.java
View File

@@ -452,4 +452,17 @@ public class Message extends FileObject {
return !(o instanceof FileObjectWithMessages) || ((FileObjectWithMessages) o).HasMessage(this);
} else return false;
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return group_s;
case 2:
return line;
case 3:
return value;
default:
return null;
}
}
}

13
src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
View File

@@ -18,19 +18,6 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
super(d_in);
}
@Override
public Object getFieldAt(M object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.group_s;
case 2:
return object.line;
case 3:
return object.value;
default:
return null;
}
}
@Override
public Comparator<M> getComparator() {
return Comparator.comparingInt(o -> o.line);
}

9
src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java
View File

@@ -45,4 +45,13 @@ public class MessageRecommendation extends iDBObject {
public boolean isVisible() {
return true;
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return text;
default:
return null;
}
}
}

9
src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
View File

@@ -34,15 +34,6 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
};
}
@Override
public Object getFieldAt(MessageRecommendation object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.text;
default:
return null;
}
}
@Override
public String getSingleDescription() {
return "рекомендация";
}

21
src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
View File

@@ -59,27 +59,6 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
};
}
@Override
public Object getFieldAt(ProjectArray object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.State;
case 2:
return object.GetShortNameWithDim();
case 3:
return object.locName + " : " + object.location;
case 4:
return object.GetDeclPlacesList();
case 5:
return object.dimSize;
case 6:
return object.typeSize;
case 7:
return object.GetRegionsText();
default:
return null;
}
}
@Override
public void SelectAll(boolean flag) {
Global.mainModule.getPass(PassCode.MassSelectArrays).Do(flag, new Vector(Global.mainModule.getProject().declaratedArrays.Data.values()));
}

21
src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
View File

@@ -395,4 +395,25 @@ public class ProjectArray extends DBObject {
return (isLoopArrayFlag == 0) && (isTemplFlag == 0);
}
//----
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return State;
case 2:
return GetShortNameWithDim();
case 3:
return locName + " : " + location;
case 4:
return GetDeclPlacesList();
case 5:
return dimSize;
case 6:
return typeSize;
case 7:
return GetRegionsText();
default:
return null;
}
}
}

21
src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java
View File

@@ -143,4 +143,25 @@ public class ParallelRegion extends DBObject {
} else if (new_array.isLoopArrayFlag != 1) arrays_count++;
*/
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return originalName;
case 2:
return lines_count;
case 3:
return arrays_count;
case 4:
return loops_count;
case 5:
return fd_count;
case 6:
return fc_count;
case 7:
return fragments;
default:
return null;
}
}
}

21
src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
View File

@@ -47,25 +47,4 @@ public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
}
};
}
@Override
public Object getFieldAt(ParallelRegion object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.originalName;
case 2:
return object.lines_count;
case 3:
return object.arrays_count;
case 4:
return object.loops_count;
case 5:
return object.fd_count;
case 6:
return object.fc_count;
case 7:
return object.fragments;
default:
return null;
}
}
}

32
src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java
View File

@@ -90,4 +90,36 @@ public class ParallelVariant extends DBObject {
}
return project;
}
//-
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return templates_description;
case 3:
return stats.ParallelCount;
case 4:
return stats.RemoteCount;
case 5:
return stats.RedistributeCount;
case 6:
return stats.IntervalCount;
case 7:
return stats.PS_RemoteCount;
case 8:
return stats.PS_ShadowCount;
case 9:
return stats.PS_ReductionCount;
case 10:
return stats.PS_AcrossCount;
case 11:
return stats.Rank;
case 12:
return stats.getPredictionDate();
case 13:
return stats.last_version;
default:
return null;
}
}
}

31
src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java
View File

@@ -61,37 +61,6 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
};
}
@Override
public Object getFieldAt(ParallelVariant object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.templates_description;
case 3:
return object.stats.ParallelCount;
case 4:
return object.stats.RemoteCount;
case 5:
return object.stats.RedistributeCount;
case 6:
return object.stats.IntervalCount;
case 7:
return object.stats.PS_RemoteCount;
case 8:
return object.stats.PS_ShadowCount;
case 9:
return object.stats.PS_ReductionCount;
case 10:
return object.stats.PS_AcrossCount;
case 11:
return object.stats.Rank;
case 12:
return object.stats.getPredictionDate();
case 13:
return object.stats.last_version;
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.ParallelVariant;
}

25
src/_VisualDVM/Repository/BugReport/BugReport.java
View File

@@ -72,4 +72,29 @@ public class BugReport extends rDBObject {
public boolean isVisible() {
return BugReportInterface.isVisible(this);
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
//todo выкинуть этот интерфейс. бессмысленный
return BugReportInterface.getDescriptionHeader(this);
case 2:
return sender_name;
case 3:
return executor;
case 4:
return project_version;
case 5:
return percentage;
case 6:
return getDate();
case 7:
return getChangeDate();
case 8:
return state;
default:
return null;
}
}
}

24
src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
View File

@@ -99,29 +99,6 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
return (o1, o2) -> -(o1.getDate().compareTo(o2.getDate()));
}
@Override
public Object getFieldAt(BugReport object, int columnIndex) {
switch (columnIndex) {
case 1:
return BugReportInterface.getDescriptionHeader(object);
case 2:
return object.sender_name;
case 3:
return object.executor;
case 4:
return object.project_version;
case 5:
return object.percentage;
case 6:
return object.getDate();
case 7:
return object.getChangeDate();
case 8:
return object.state;
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.BugReport;
}
@@ -132,4 +109,5 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
public PassCode_ getDeletePassCode() {
return PassCode.DeleteBugReport;
}
//-
}

17
src/_VisualDVM/Repository/Component/Component.java
View File

@@ -136,4 +136,21 @@ public abstract class Component extends DBObject implements Loggable {
public boolean isNecessary() {
return true;
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return getComponentType().getDescription();
case 3:
return version;
case 4:
return actual_version;
case 5:
return date_text;
case 6:
return getState();
default:
return null;
}
}
}

17
src/_VisualDVM/Repository/Component/ComponentsSet.java
View File

@@ -72,23 +72,6 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
};
}
@Override
public Object getFieldAt(Component object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.getComponentType().getDescription();
case 3:
return object.version;
case 4:
return object.actual_version;
case 5:
return object.date_text;
case 6:
return object.getState();
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.Component;
}

12
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspace.java
View File

@@ -13,4 +13,16 @@ public class SubscriberWorkspace extends iDBObject {
(Global.mainModule.getAccount().isAdmin() || Global.mainModule.getAccount().email.equals(Global.mainModule.getSubscriber().address));
}
//-
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return URL;
case 2:
return login;
case 3:
return path;
}
return null;
}
}

13
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
View File

@@ -48,19 +48,8 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
};
}
@Override
public Object getFieldAt(SubscriberWorkspace object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.URL;
case 2:
return object.login;
case 3:
return object.path;
}
return null;
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteSubscriberWorkspace;
}
}

13
src/_VisualDVM/Repository/Subscribes/Subscriber.java
View File

@@ -36,4 +36,17 @@ public class Subscriber extends DBObject {
public Object getEmptyFK() {
return "";
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return name;
case 3:
return role.getDescription();
case 4:
return (mailOn == 0) ? "выключена" : "включена";
}
return name;
}
}

12
src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
View File

@@ -64,18 +64,6 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
};
}
@Override
public Object getFieldAt(Subscriber object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.name;
case 3:
return object.role.getDescription();
case 4:
return (object.mailOn == 0) ? "выключена" : "включена";
}
return object.name;
}
@Override
public Current CurrentName() {
return Current.Subscriber;
}

15
src/_VisualDVM/TestingSystem/Common/Group/Group.java
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;
}
}
}

15
src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
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;
}

16
src/_VisualDVM/TestingSystem/Common/Test/Test.java
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;
}
}
}

16
src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
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;

26
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java
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;
}
}
}

25
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
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) {

32
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
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;
}
}
}

30
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
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

25
src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java
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;
}
}
}

26
src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
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) {

31
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java
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;
}
}
}
//--

32
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
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;

23
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
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;
}
}
}

23
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
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() {

28
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
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;
}
}
}

27
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
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>() {

13
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java
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;
}
}
}

13
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
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() {

9
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java
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;
}
}
}

10
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
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;

14
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java
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;
}
}

15
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
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) {