no message

This commit is contained in:
2024-10-26 15:14:23 +03:00
parent c3ce2fed96
commit ed37dd2107
38 changed files with 222 additions and 50 deletions

31
.idea/workspace.xml generated
View File

@@ -7,13 +7,44 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@@ -26,7 +26,7 @@ import java.util.Comparator;
import java.util.Vector; import java.util.Vector;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.IntStream; import java.util.stream.IntStream;
public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTable> { public abstract class DataSetControlForm<D extends DBObject> extends ControlForm<DataTable> {
protected DataSet<?, D> dataSource; //источник данных protected DataSet<?, D> dataSource; //источник данных
protected D current = null; //заменить все обращения к мейн модулю. protected D current = null; //заменить все обращения к мейн модулю.
protected DataMenuBar bar = null; //верхняя панель меню protected DataMenuBar bar = null; //верхняя панель меню
@@ -48,6 +48,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
columns.add(createPKColumn()); columns.add(createPKColumn());
if (hasCheckBox()) if (hasCheckBox())
columns.add(createCheckBoxColummn()); columns.add(createCheckBoxColummn());
createColumns();
//-- //--
createFilters(); createFilters();
//-- //--
@@ -78,14 +79,24 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
} }
} }
} }
protected boolean isPKVisible() {
return true;
}
protected ColumnInfo<D> createPKColumn() { protected ColumnInfo<D> createPKColumn() {
return new ColumnInfo<D>(dataSource.getPKName()) { return new ColumnInfo<D>(dataSource.getPKName()) {
@Override @Override
public Object getFieldAt(D object) { public Object getFieldAt(D object) {
return object.getPK(); return object.getPK();
} }
@Override
public boolean isVisible() {
return isPKVisible();
}
}; };
} }
protected boolean hasCheckBox() {
return true;
}
protected ColumnInfo<D> createCheckBoxColummn() { protected ColumnInfo<D> createCheckBoxColummn() {
return new ColumnInfo<D>("") { return new ColumnInfo<D>("") {
@Override @Override
@@ -120,7 +131,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
} }
return res; return res;
} }
protected void AddFilters(DBObjectFilter_<D>... new_filters) { protected final void AddFilters(DBObjectFilter_<D>... new_filters) {
Collections.addAll(allFilters, new_filters); Collections.addAll(allFilters, new_filters);
} }
protected final void AddColumns(ColumnInfo<D>... new_columns) { protected final void AddColumns(ColumnInfo<D>... new_columns) {
@@ -354,6 +365,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
} }
protected void createFilters() { protected void createFilters() {
} }
protected abstract void createColumns();
boolean ApplyFilters(D object) { boolean ApplyFilters(D object) {
for (DBObjectFilter_ filterInterface : allFilters) { for (DBObjectFilter_ filterInterface : allFilters) {
if (!filterInterface.Validate(object)) if (!filterInterface.Validate(object))
@@ -398,9 +410,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected void MouseAction2() throws Exception { protected void MouseAction2() throws Exception {
} }
//- //-
protected boolean hasCheckBox() {
return true;
}
protected boolean hasMenuBar() { protected boolean hasMenuBar() {
return true; return true;
} }

View File

@@ -13,6 +13,9 @@ import javax.swing.*;
public class CompilersForm extends DataSetControlForm<Compiler> { public class CompilersForm extends DataSetControlForm<Compiler> {
public CompilersForm(DataSet<?, Compiler> dataSource_in, JPanel mountPanel_in) { public CompilersForm(DataSet<?, Compiler> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<Compiler>("описание") { new ColumnInfo<Compiler>("описание") {
@Override @Override

View File

@@ -9,6 +9,9 @@ import javax.swing.*;
public class CompilerEnvironmentsForm extends DataSetControlForm<CompilerEnvironment> { public class CompilerEnvironmentsForm extends DataSetControlForm<CompilerEnvironment> {
public CompilerEnvironmentsForm(DataSet<?, CompilerEnvironment> dataSource_in, JPanel mountPanel_in) { public CompilerEnvironmentsForm(DataSet<?, CompilerEnvironment> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<CompilerEnvironment>("Значение") { new ColumnInfo<CompilerEnvironment>("Значение") {
@Override @Override

View File

@@ -9,6 +9,9 @@ import javax.swing.*;
public class CompilerOptionsForm extends DataSetControlForm<CompilerOption> { public class CompilerOptionsForm extends DataSetControlForm<CompilerOption> {
public CompilerOptionsForm(DataSet<?, CompilerOption> dataSource_in, JPanel mountPanel_in) { public CompilerOptionsForm(DataSet<?, CompilerOption> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<CompilerOption>("Параметр") { new ColumnInfo<CompilerOption>("Параметр") {
@Override @Override

View File

@@ -12,6 +12,9 @@ import javax.swing.*;
public class DVMParametersForm extends DataSetControlForm<DVMParameter> { public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
public DVMParametersForm(DataSet<?, DVMParameter> dataSource_in, JPanel mountPanel_in) { public DVMParametersForm(DataSet<?, DVMParameter> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<DVMParameter>("имя") { new ColumnInfo<DVMParameter>("имя") {
@Override @Override

View File

@@ -14,6 +14,13 @@ import javax.swing.*;
public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue> { public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue> {
public EnvironmentsValuesForm(DataSet<?, EnvironmentValue> dataSource_in, JPanel mountPanel_in) { public EnvironmentsValuesForm(DataSet<?, EnvironmentValue> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected boolean hasCheckBox() {
return false;
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<EnvironmentValue>("имя") { new ColumnInfo<EnvironmentValue>("имя") {
@Override @Override
@@ -30,10 +37,6 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
); );
} }
@Override @Override
protected boolean hasCheckBox() {
return false;
}
@Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddEnvironmentValue, PassCode.AddEnvironmentValue,

View File

@@ -9,6 +9,9 @@ import javax.swing.*;
public class DirInfosForm extends DataSetControlForm<DirInfo> { public class DirInfosForm extends DataSetControlForm<DirInfo> {
public DirInfosForm(DataSet<?, DirInfo> dataSource_in, JPanel mountPanel_in) { public DirInfosForm(DataSet<?, DirInfo> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<DirInfo>("дата изменения") { new ColumnInfo<DirInfo>("дата изменения") {
@Override @Override

View File

@@ -16,6 +16,9 @@ import java.awt.event.ActionListener;
public class MachinesForm extends DataSetControlForm<Machine> { public class MachinesForm extends DataSetControlForm<Machine> {
public MachinesForm(DataSet<?, Machine> dataSource_in, JPanel mountPanel_in) { public MachinesForm(DataSet<?, Machine> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<Machine>("URL") { new ColumnInfo<Machine>("URL") {
@Override @Override

View File

@@ -15,6 +15,9 @@ import javax.swing.*;
public class MakefilesForm extends DataSetControlForm<Makefile> { public class MakefilesForm extends DataSetControlForm<Makefile> {
public MakefilesForm(DataSet<?, Makefile> dataSource_in, JPanel mountPanel_in) { public MakefilesForm(DataSet<?, Makefile> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<Makefile>("Линковщик") { new ColumnInfo<Makefile>("Линковщик") {
@Override @Override

View File

@@ -14,6 +14,13 @@ import javax.swing.*;
public class ModulesForm extends DataSetControlForm<Module> { public class ModulesForm extends DataSetControlForm<Module> {
public ModulesForm(DataSet<?, Module> dataSource_in, JPanel mountPanel_in) { public ModulesForm(DataSet<?, Module> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected boolean isPKVisible() {
return false;
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<Module>("Язык") { new ColumnInfo<Module>("Язык") {
@Override @Override
@@ -40,7 +47,6 @@ public class ModulesForm extends DataSetControlForm<Module> {
} }
} }
); );
getColumnInfo(0).setVisible(false);
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -13,6 +13,13 @@ import javax.swing.*;
public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration> { public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration> {
public RunConfigurationsForm(DataSet<?, RunConfiguration> dataSource_in, JPanel mountPanel_in) { public RunConfigurationsForm(DataSet<?, RunConfiguration> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected boolean hasCheckBox() {
return false;
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<RunConfiguration>("Команда") { new ColumnInfo<RunConfiguration>("Команда") {
@Override @Override
@@ -59,10 +66,6 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
); );
} }
@Override @Override
protected boolean hasCheckBox() {
return false;
}
@Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.Run, PassCode.Run,

View File

@@ -13,6 +13,9 @@ import java.util.Date;
public class SapforProfilesForm extends DataSetControlForm<SapforProfile> { public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
public SapforProfilesForm(DataSet<?, SapforProfile> dataSource_in, JPanel mountPanel_in) { public SapforProfilesForm(DataSet<?, SapforProfile> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<SapforProfile>("Описание") { new ColumnInfo<SapforProfile>("Описание") {
@Override @Override

View File

@@ -10,6 +10,9 @@ import javax.swing.*;
public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileSetting> { public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileSetting> {
public SapforProfileSettingsForm(DataSet<?, SapforProfileSetting> dataSource_in, JPanel mountPanel_in) { public SapforProfileSettingsForm(DataSet<?, SapforProfileSetting> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<SapforProfileSetting>("имя") { new ColumnInfo<SapforProfileSetting>("имя") {
@Override @Override
@@ -24,13 +27,16 @@ public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileS
} }
} }
); );
getColumnInfo(0).setVisible(false);
} }
@Override @Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return false; return false;
} }
@Override @Override
protected boolean isPKVisible() {
return false;
}
@Override
protected boolean hasMenuBar() { protected boolean hasMenuBar() {
return false; return false;
} }

View File

@@ -16,6 +16,9 @@ import javax.swing.*;
public class CompilationTasksForm extends DataSetControlForm<CompilationTask> { public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
public CompilationTasksForm(DataSet<?, CompilationTask> dataSource_in, JPanel mountPanel_in) { public CompilationTasksForm(DataSet<?, CompilationTask> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<CompilationTask>("сборка") { new ColumnInfo<CompilationTask>("сборка") {
@Override @Override

View File

@@ -18,6 +18,9 @@ import javax.swing.*;
public class RunTasksForm extends DataSetControlForm<RunTask> { public class RunTasksForm extends DataSetControlForm<RunTask> {
public RunTasksForm(DataSet<?, RunTask> dataSource_in, JPanel mountPanel_in) { public RunTasksForm(DataSet<?, RunTask> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<RunTask>("Матрица") { new ColumnInfo<RunTask>("Матрица") {
@Override @Override

View File

@@ -15,6 +15,9 @@ import javax.swing.*;
public class UsersForm extends DataSetControlForm<User> { public class UsersForm extends DataSetControlForm<User> {
public UsersForm(DataSet<?, User> dataSource_in, JPanel mountPanel_in) { public UsersForm(DataSet<?, User> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<User>("Логин") { new ColumnInfo<User>("Логин") {
@Override @Override

View File

@@ -10,6 +10,9 @@ import javax.swing.*;
public class DBArraysForm extends DataSetControlForm<DBArray> { public class DBArraysForm extends DataSetControlForm<DBArray> {
public DBArraysForm(DataSet<?, DBArray> dataSource_in, JPanel mountPanel_in) { public DBArraysForm(DataSet<?, DBArray> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<DBArray>("Имя") { new ColumnInfo<DBArray>("Имя") {
@Override @Override

View File

@@ -13,6 +13,17 @@ import java.util.Comparator;
public class MessagesControlForm extends DataSetControlForm<Message> { public class MessagesControlForm extends DataSetControlForm<Message> {
public MessagesControlForm(DataSet dataSource_in, JPanel mountPanel_in) { public MessagesControlForm(DataSet dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected boolean hasCheckBox() {
return false;
}
@Override
protected boolean isPKVisible() {
return false;
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<Message>("группа") { new ColumnInfo<Message>("группа") {
@Override @Override
@@ -41,11 +52,6 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
} }
} }
); );
getColumnInfo(0).setVisible(false);
}
@Override
protected boolean hasCheckBox() {
return false;
} }
@Override @Override
protected void ShowCurrentObject() throws Exception { protected void ShowCurrentObject() throws Exception {

View File

@@ -10,6 +10,17 @@ import javax.swing.*;
public class RecommendationsForm extends DataSetControlForm<MessageRecommendation> { public class RecommendationsForm extends DataSetControlForm<MessageRecommendation> {
public RecommendationsForm(DataSet<?, MessageRecommendation> dataSource_in, JPanel mountPanel_in) { public RecommendationsForm(DataSet<?, MessageRecommendation> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected boolean isPKVisible() {
return false;
}
@Override
protected boolean hasCheckBox() {
return false;
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<MessageRecommendation>("текст") { new ColumnInfo<MessageRecommendation>("текст") {
@Override @Override
@@ -26,11 +37,6 @@ public class RecommendationsForm extends DataSetControlForm<MessageRecommendatio
} }
} }
); );
getColumnInfo(0).setVisible(false);
}
@Override
protected boolean hasCheckBox() {
return false;
} }
@Override @Override
protected void createFilters() { protected void createFilters() {

View File

@@ -25,6 +25,13 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
//-- //--
public ProjectArraysForm(DataSet<?, ProjectArray> dataSource_in, JPanel mountPanel_in) { public ProjectArraysForm(DataSet<?, ProjectArray> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected boolean isPKVisible() {
return false;
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<ProjectArray>("Имя") { new ColumnInfo<ProjectArray>("Имя") {
@Override @Override
@@ -76,7 +83,6 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
} }
} }
); );
getColumnInfo(0).setVisible(false);
} }
@Override @Override
protected ColumnInfo<ProjectArray> createCheckBoxColummn() { protected ColumnInfo<ProjectArray> createCheckBoxColummn() {

View File

@@ -10,6 +10,13 @@ import javax.swing.*;
public class ParallelRegionsForm extends DataSetControlForm<ParallelRegion> { public class ParallelRegionsForm extends DataSetControlForm<ParallelRegion> {
public ParallelRegionsForm(DataSet<?, ParallelRegion> dataSource_in, JPanel mountPanel_in) { public ParallelRegionsForm(DataSet<?, ParallelRegion> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected boolean hasCheckBox() {
return false;
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<ParallelRegion>("Имя") { new ColumnInfo<ParallelRegion>("Имя") {
@Override @Override
@@ -79,8 +86,4 @@ public class ParallelRegionsForm extends DataSetControlForm<ParallelRegion> {
} }
); );
} }
@Override
protected boolean hasCheckBox() {
return false;
}
} }

View File

@@ -13,6 +13,13 @@ import javax.swing.*;
public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> { public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
public ParallelVariantsForm(DataSet<?, ParallelVariant> dataSource_in, JPanel mountPanel_in) { public ParallelVariantsForm(DataSet<?, ParallelVariant> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected boolean isPKVisible() {
return false;
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<ParallelVariant>("Распределение") { new ColumnInfo<ParallelVariant>("Распределение") {
@Override @Override
@@ -131,7 +138,6 @@ public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
} }
} }
); );
getColumnInfo(0).setVisible(false);
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -28,6 +28,9 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
//- //-
public BugReportsForm(DataSet<?, BugReport> dataSource_in, JPanel mountPanel_in) { public BugReportsForm(DataSet<?, BugReport> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<BugReport>("Описание") { new ColumnInfo<BugReport>("Описание") {
@Override @Override

View File

@@ -17,6 +17,9 @@ import java.util.Vector;
public class ComponentsForm extends DataSetControlForm<Component> { public class ComponentsForm extends DataSetControlForm<Component> {
public ComponentsForm(DataSet<?, Component> dataSource_in, JPanel mountPanel_in) { public ComponentsForm(DataSet<?, Component> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<Component>("Компонент") { new ColumnInfo<Component>("Компонент") {
@Override @Override

View File

@@ -12,6 +12,17 @@ import javax.swing.*;
public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> { public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> {
public SubscriberWorkspacesForm(DataSet<?, SubscriberWorkspace> dataSource_in, JPanel mountPanel_in) { public SubscriberWorkspacesForm(DataSet<?, SubscriberWorkspace> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected boolean isPKVisible() {
return false;
}
@Override
protected boolean hasCheckBox() {
return false;
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<SubscriberWorkspace>("URL") { new ColumnInfo<SubscriberWorkspace>("URL") {
@Override @Override
@@ -32,11 +43,6 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
} }
} }
); );
getColumnInfo(0).setVisible(false);
}
@Override
protected boolean hasCheckBox() {
return false;
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -14,6 +14,22 @@ import javax.swing.*;
public class SubsribersForm extends DataSetControlForm<Subscriber> { public class SubsribersForm extends DataSetControlForm<Subscriber> {
public SubsribersForm(DataSet<?, Subscriber> dataSource_in, JPanel mountPanel_in) { public SubsribersForm(DataSet<?, Subscriber> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected ColumnInfo<Subscriber> createPKColumn() {
return new ColumnInfo<Subscriber>(dataSource.getPKName()) {
@Override
public Object getFieldAt(Subscriber object) {
return object.getPK();
}
@Override
public boolean isVisible() {
return Global.mainModule.getAccount().role.equals(AccountRole.Admin);
}
};
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<Subscriber>("Имя") { new ColumnInfo<Subscriber>("Имя") {
@Override @Override
@@ -48,19 +64,6 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
); );
} }
@Override @Override
protected ColumnInfo<Subscriber> createPKColumn() {
return new ColumnInfo<Subscriber>(dataSource.getPKName()) {
@Override
public Object getFieldAt(Subscriber object) {
return object.getPK();
}
@Override
public boolean isVisible() {
return Global.mainModule.getAccount().role.equals(AccountRole.Admin);
}
};
}
@Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SaveBugReportExecutor, PassCode.SaveBugReportExecutor,

View File

@@ -20,6 +20,9 @@ public class GroupsForm extends DataSetControlForm<Group> {
public static boolean filterMyOnly = false; public static boolean filterMyOnly = false;
public GroupsForm(DataSet<?, Group> dataSource_in, JPanel mountPanel_in) { public GroupsForm(DataSet<?, Group> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<Group>("имя") { new ColumnInfo<Group>("имя") {
@Override @Override

View File

@@ -13,6 +13,9 @@ import javax.swing.*;
public class TestsForm extends DataSetControlForm<Test> { public class TestsForm extends DataSetControlForm<Test> {
public TestsForm(DataSet<?, Test> dataSource_in, JPanel mountPanel_in) { public TestsForm(DataSet<?, Test> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<Test>("имя") { new ColumnInfo<Test>("имя") {
@Override @Override

View File

@@ -15,6 +15,9 @@ import javax.swing.*;
public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration> { public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration> {
public DVMConfigurationsForm(DataSet<?, DVMConfiguration> dataSource_in, JPanel mountPanel_in) { public DVMConfigurationsForm(DataSet<?, DVMConfiguration> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<DVMConfiguration>("имя") { new ColumnInfo<DVMConfiguration>("имя") {
@Override @Override

View File

@@ -17,6 +17,9 @@ import java.util.Date;
public class DVMPackagesForm extends DataSetControlForm<DVMPackage> { public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) { public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<DVMPackage>("Автор") { new ColumnInfo<DVMPackage>("Автор") {
@Override @Override

View File

@@ -12,6 +12,9 @@ import javax.swing.*;
public class DVMSettingsForm extends DataSetControlForm<DVMSettings> { public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
public DVMSettingsForm(DataSet<?, DVMSettings> dataSource_in, JPanel mountPanel_in) { public DVMSettingsForm(DataSet<?, DVMSettings> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<DVMSettings>("имя") { new ColumnInfo<DVMSettings>("имя") {
@Override @Override

View File

@@ -17,6 +17,9 @@ import java.util.Comparator;
public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> { public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
public DVMRunTasksForm(DataSet<?, DVMRunTask> dataSource_in, JPanel mountPanel_in) { public DVMRunTasksForm(DataSet<?, DVMRunTask> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<DVMRunTask>("Тест") { new ColumnInfo<DVMRunTask>("Тест") {
@Override @Override

View File

@@ -16,6 +16,9 @@ import javax.swing.*;
public class SapforConfigurationsForm extends DataSetControlForm<SapforConfiguration> { public class SapforConfigurationsForm extends DataSetControlForm<SapforConfiguration> {
public SapforConfigurationsForm(DataSet<?, SapforConfiguration> dataSource_in, JPanel mountPanel_in) { public SapforConfigurationsForm(DataSet<?, SapforConfiguration> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<SapforConfiguration>("имя") { new ColumnInfo<SapforConfiguration>("имя") {
@Override @Override

View File

@@ -17,6 +17,9 @@ import java.util.Date;
public class SapforPackagesForm extends DataSetControlForm<SapforPackage> { public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) { public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<SapforPackage>("Автор") { new ColumnInfo<SapforPackage>("Автор") {
@Override @Override

View File

@@ -11,6 +11,9 @@ import javax.swing.*;
public class SapforSettingsForm extends DataSetControlForm<SapforSettings> { public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
public SapforSettingsForm(DataSet<?, SapforSettings> dataSource_in, JPanel mountPanel_in) { public SapforSettingsForm(DataSet<?, SapforSettings> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<SapforSettings>("имя") { new ColumnInfo<SapforSettings>("имя") {
@Override @Override

View File

@@ -13,6 +13,9 @@ import javax.swing.*;
public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSettingsCommand> { public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSettingsCommand> {
public SapforSettingsCommandsForm(DataSet<?, SapforSettingsCommand> dataSource_in, JPanel mountPanel_in) { public SapforSettingsCommandsForm(DataSet<?, SapforSettingsCommand> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<SapforSettingsCommand>("Проход") { new ColumnInfo<SapforSettingsCommand>("Проход") {
@Override @Override
@@ -21,7 +24,10 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
} }
} }
); );
getColumnInfo(0).setVisible(false); }
@Override
protected boolean isPKVisible() {
return false;
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -14,6 +14,9 @@ import java.util.Comparator;
public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> { public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
public ServerSapforsForm(DataSet<?, ServerSapfor> dataSource_in, JPanel mountPanel_in) { public ServerSapforsForm(DataSet<?, ServerSapfor> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
}
@Override
protected void createColumns() {
AddColumns( AddColumns(
new ColumnInfo<ServerSapfor>("версия") { new ColumnInfo<ServerSapfor>("версия") {
@Override @Override