M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2024-10-20 21:59:39 +03:00
parent 99643aa755
commit fda2940a79
95 changed files with 872 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,6 @@
package _VisualDVM.GlobalData.Compiler;
import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironmentsSet;
import _VisualDVM.GlobalData.CompilerOption.CompilerOptionsSet;
import _VisualDVM.GlobalData.Machine.Machine;
@@ -187,18 +185,4 @@ public class Compiler extends iDBObject {
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;
}
}

16
src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
View File

@@ -49,6 +49,20 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
}
@Override
public boolean isObjectVisible(Compiler object) {
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
}
@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;
}
}

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

@@ -73,15 +73,4 @@ 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/UI/CompilerEnvironmentsForm.java
View File

@@ -20,6 +20,17 @@ public class CompilerEnvironmentsForm extends DataSetControlForm<CompilerEnviron
};
}
@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 void AdditionalInitColumns() {
columns.get(2).setRendererClass(CompilerEnvironmentValueRenderer.class);
columns.get(2).setEditorClass(CompilerEnvironmentValueEditor.class);

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

@@ -45,17 +45,4 @@ 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;
}
}
}

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

@@ -1,6 +1,7 @@
package _VisualDVM.GlobalData.CompilerOption;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionsForm;
import javax.swing.*;
public class CompilerOptionsSet extends DataSet<String, CompilerOption> {

18
src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsForm.java → src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionsForm.java
View File

@@ -1,9 +1,8 @@
package _VisualDVM.GlobalData.CompilerOption;
package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
import javax.swing.*;
public class CompilerOptionsForm extends DataSetControlForm<CompilerOption> {
@@ -23,6 +22,19 @@ public class CompilerOptionsForm extends DataSetControlForm<CompilerOption> {
};
}
@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 void AdditionalInitColumns() {
columns.get(2).setRendererClass(CompilerOptionParameterNameRenderer.class);
columns.get(3).setRendererClass(CompilerOptionParameterValueRenderer.class);

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

@@ -5,14 +5,5 @@ 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;
}
}

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

@@ -64,8 +64,7 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
for (DVMParameter par : (Global.mainModule.getDb()).dvmParameters.Data.values()) {
if (
Global.mainModule.getDb().dvmParameters.getUI().isObjectVisible(par)
&& (Result.id != par.id) && (par.name.equals(name))) {
&& (Result.id != par.id) && (par.name.equals(name))) {
Log.Writeln("В конфигурации запуска уже задан параметр DVM системы с именем " + Utils_.Brackets(name));
break;
}

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

@@ -18,6 +18,16 @@ public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
};
}
@Override
public Object getFieldAt(DVMParameter object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.name;
case 2:
return object.value;
}
return null;
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}

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

@@ -2,8 +2,6 @@ package _VisualDVM.GlobalData.EnvironmentValue;
import Common.CommonConstants;
import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
public class EnvironmentValue extends iDBObject {
public String name = "";
public String value = "";
@@ -13,14 +11,4 @@ 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;
}
}

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

@@ -51,7 +51,7 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
for (EnvironmentValue env : Global.mainModule.getDb().environmentValues.Data.values()) {
if (
Global.mainModule.getDb().environmentValues.getUI().isObjectVisible(env)
&& (Result.id != env.id) && (env.name.equals(name))) {
&& (Result.id != env.id) && (env.name.equals(name))) {
Log.Writeln("В конфигурации запуска уже задана переменная окружения с именем " + Utils_.Brackets(name));
break;
}

13
src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
View File

@@ -4,7 +4,6 @@ import Common.MainModule_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.Passes.PassCode;
@@ -20,6 +19,16 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
"значение"};
}
@Override
public Object getFieldAt(EnvironmentValue object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.name;
case 2:
return object.value;
}
return null;
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@@ -33,6 +42,6 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
}
@Override
public boolean isObjectVisible(EnvironmentValue object) {
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id);
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id);
}
}

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

@@ -20,13 +20,4 @@ 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/UI/DirInfosForm.java
View File

@@ -15,6 +15,15 @@ public class DirInfosForm extends DataSetControlForm<DirInfo> {
"дата изменения"};
}
@Override
public Object getFieldAt(DirInfo object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.getDate();
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() {
columns.get(1).setRendererClass(RendererDate.class);
}

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

@@ -63,13 +63,4 @@ 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/UI/MachinesForm.java
View File

@@ -60,4 +60,13 @@ public class MachinesForm extends DataSetControlForm<Machine> {
}
};
}
@Override
public Object getFieldAt(Machine object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.getURL();
default:
return null;
}
}
}

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

@@ -1,7 +1,6 @@
package _VisualDVM.GlobalData.Makefile;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
@@ -196,17 +195,4 @@ 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;
}
}
}

16
src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
View File

@@ -4,7 +4,6 @@ import Common.MainModule_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.Passes.PassCode;
@@ -26,6 +25,19 @@ public class MakefilesForm extends DataSetControlForm<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
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@@ -44,7 +56,7 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
}
@Override
public boolean isObjectVisible(Makefile object) {
return super.isObjectVisible(object)&&
return super.isObjectVisible(object) &&
MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
}
}

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

@@ -1,7 +1,6 @@
package _VisualDVM.GlobalData.Module;
import Common.CommonConstants;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.ProjectData.LanguageName;
@@ -31,19 +30,4 @@ 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;
}
}
}

19
src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
View File

@@ -4,7 +4,6 @@ import Common.MainModule_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.Passes.PassCode;
@@ -27,6 +26,21 @@ public class ModulesForm extends DataSetControlForm<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
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@@ -36,7 +50,6 @@ public class ModulesForm extends DataSetControlForm<Module> {
}
@Override
public boolean isObjectVisible(Module object) {
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Makefile, object.makefile_id);
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Makefile, object.makefile_id);
}
}

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

@@ -4,7 +4,6 @@ import Common.Database.Objects.iDBObject;
import Common.Passes.PassException;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
@@ -252,25 +251,4 @@ 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;
}
}
}

24
src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
View File

@@ -4,7 +4,6 @@ import Common.MainModule_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.Passes.PassCode;
@@ -26,6 +25,27 @@ public class RunConfigurationsForm extends DataSetControlForm<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
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@@ -44,6 +64,6 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
}
@Override
public boolean isObjectVisible(RunConfiguration object) {
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
}
}

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

@@ -1,22 +1,9 @@
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;
}
}
}

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

@@ -6,10 +6,10 @@ import Common.Database.Tables.FKDataBehaviour;
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.GlobalData.SapforProfile.UI.SapforProfileFields;
import _VisualDVM.GlobalData.SapforProfile.UI.SapforProfilesForm;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
import _VisualDVM.Passes.PassCode;
@@ -29,27 +29,7 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Описание",
"Дата создания"
};
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SaveProfile,
PassCode.EditProfile,
PassCode.ApplyProfile,
PassCode.DeleteProfile);
}
};
return new SapforProfilesForm(this, mountPanel);
}
@Override
public Current CurrentName() {

44
src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java Normal file
View File

@@ -0,0 +1,44 @@
package _VisualDVM.GlobalData.SapforProfile.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.util.Date;
public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
public SapforProfilesForm(DataSet<?, SapforProfile> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Описание",
"Дата создания"
};
}
@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 DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SaveProfile,
PassCode.EditProfile,
PassCode.ApplyProfile,
PassCode.DeleteProfile);
}
}

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

@@ -1,8 +1,6 @@
package _VisualDVM.GlobalData.SapforProfileSetting;
import Common.CommonConstants;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import com.sun.org.glassfish.gmbal.Description;
public class SapforProfileSetting extends iDBObject {
@@ -12,15 +10,4 @@ public class SapforProfileSetting extends iDBObject {
public String value = "";
@Description("DEFAULT -1")
public int sapforprofile_id = CommonConstants.Nan;
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return name.getDescription();
case 2:
return value;
default:
return null;
}
}
}

14
src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java
View File

@@ -3,7 +3,6 @@ import Common.Database.Tables.DataSet;
import Common.MainModule_;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
import javax.swing.*;
@@ -19,6 +18,17 @@ public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileS
};
}
@Override
public Object getFieldAt(SapforProfileSetting object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.name.getDescription();
case 2:
return object.value;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@@ -28,6 +38,6 @@ public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileS
}
@Override
public boolean isObjectVisible(SapforProfileSetting object) {
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.SapforProfile, object.sapforprofile_id);
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.SapforProfile, object.sapforprofile_id);
}
}

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

@@ -1,7 +1,6 @@
package _VisualDVM.GlobalData.Tasks.CompilationTask;
import Common.CommonConstants;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.Module;
@@ -105,35 +104,4 @@ public class CompilationTask extends Task {
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;
}
}
}

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

@@ -57,10 +57,41 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
}
@Override
public boolean isObjectVisible(CompilationTask object) {
return super.isObjectVisible(object)&&
return super.isObjectVisible(object) &&
MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id) &&
MainModule_.instance.matchCurrentID(Current.User, object.user_id) &&
Global.mainModule.HasProject() &&
object.belongsToProject(Global.mainModule.getProject());
}
@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;
}
}
}

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

@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.Tasks.RunTask;
import Common.CommonConstants;
import Common.Utils.StringTemplate;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
@@ -147,23 +146,4 @@ 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;
}
}
}

34
src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
View File

@@ -8,7 +8,6 @@ import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.MainModule;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
@@ -31,6 +30,25 @@ public class RunTasksForm extends DataSetControlForm<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
protected void AdditionalInitColumns() {
columns.get(6).setRendererClass(RendererDate.class);
columns.get(7).setRendererClass(RendererStatusEnum.class);
@@ -51,13 +69,13 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
}
@Override
public boolean isObjectVisible(RunTask object) {
return super.isObjectVisible(object)&&
return super.isObjectVisible(object) &&
MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id) &&
MainModule_.instance.matchCurrentID(Current.User, object.user_id) &&
MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id) &&
Global.mainModule.HasProject() &&
object.belongsToProject(Global.mainModule.getProject()) &&
Global.mainModule.HasCompilationTask() &&
object.compilation_task_id == Global.mainModule.getCompilationTask().id;
MainModule_.instance.matchCurrentID(Current.User, object.user_id) &&
MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id) &&
Global.mainModule.HasProject() &&
object.belongsToProject(Global.mainModule.getProject()) &&
Global.mainModule.HasCompilationTask() &&
object.compilation_task_id == Global.mainModule.getCompilationTask().id;
}
}

14
src/_VisualDVM/GlobalData/User/UI/UsersForm.java
View File

@@ -25,6 +25,17 @@ public class UsersForm extends DataSetControlForm<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
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(3).setRendererClass(RendererStatusEnum.class);
@@ -47,9 +58,8 @@ public class UsersForm extends DataSetControlForm<User> {
PassCode.InitialiseUser,
PassCode.DeleteUser);
}
@Override
public boolean isObjectVisible(User object) {
return super.isObjectVisible(object)&&super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
return super.isObjectVisible(object) && super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
}
}

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

@@ -1,9 +1,6 @@
package _VisualDVM.GlobalData.User;
import Common.CommonConstants;
import Common.Database.Objects.iDBObject;
import Common.MainModule_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.TestingSystem.DVM.UserConnection;
import com.sun.org.glassfish.gmbal.Description;
@@ -70,15 +67,4 @@ public class User extends iDBObject {
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;
}
}
}