перевод тестовых описания данных обратно в таблицы. нужно для обобщения описаний типовых проходов

This commit is contained in:
2024-10-22 19:17:01 +03:00
parent 2edaffd634
commit 2fed433634
63 changed files with 339 additions and 278 deletions

61
.idea/workspace.xml generated
View File

@@ -9,6 +9,67 @@
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.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/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.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/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.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/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.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/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.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/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.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/ModulesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModulesDBTable.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/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.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/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.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/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.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/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.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/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.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/SapforData/Arrays/ProjectArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.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/ParallelRegionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.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/ParallelVariantsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.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/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.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/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.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/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.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/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.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/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.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/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.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/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.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/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.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/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.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/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.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/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.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/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.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/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.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/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.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/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.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

@@ -19,6 +19,13 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
k = k_in; k = k_in;
d = d_in; d = d_in;
} }
//--
public String getPluralDescription() {
return "";
}
public String getSingleDescription() {
return "";
}
//--- //---
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return null; return null;

View File

@@ -72,12 +72,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
} }
} }
} }
protected String getPluralDescription() {
return "";
}
protected String getSingleDescription() {
return "";
}
<M> Vector<M> getFilters(Class<M> f) { <M> Vector<M> getFilters(Class<M> f) {
Vector<M> res = new Vector<>(); Vector<M> res = new Vector<>();
for (DBObjectFilter_ filter_ : allFilters) { for (DBObjectFilter_ filter_ : allFilters) {
@@ -342,7 +336,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
filter.Mount(getControl()); filter.Mount(getControl());
} }
protected DataMenuBar createMenuBar() { protected DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()); return new DataMenuBar(dataSource.getPluralDescription());
} }
protected void createFilters() { protected void createFilters() {
} }
@@ -465,7 +459,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
} }
public boolean CheckSelectedOrCurrent(TextLog log) { public boolean CheckSelectedOrCurrent(TextLog log) {
if ((getSelectedCount() == 0) && (CurrentName() == null || (getCurrent() == null))) { if ((getSelectedCount() == 0) && (CurrentName() == null || (getCurrent() == null))) {
log.Writeln_(getPluralDescription() + ":"); log.Writeln_(dataSource.getPluralDescription() + ":");
log.Writeln_("Отсутствуют отмеченные объекты, или текущий объект!"); log.Writeln_("Отсутствуют отмеченные объекты, или текущий объект!");
return false; return false;
} }
@@ -512,13 +506,13 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
} }
//ДИАЛОГИ //ДИАЛОГИ
public boolean ShowAddObjectDialog(D object) { public boolean ShowAddObjectDialog(D object) {
return getDialog().ShowDialog(getSingleDescription() + ": добавление", object); return getDialog().ShowDialog(dataSource.getSingleDescription() + ": добавление", object);
} }
public boolean ShowEditObjectDialog(D object) { public boolean ShowEditObjectDialog(D object) {
DBObjectDialog dialog = getDialog(); DBObjectDialog dialog = getDialog();
dialog.edit = true; dialog.edit = true;
dialog.SetEditLimits(); dialog.SetEditLimits();
String title = getSingleDescription() + ": "; String title = dataSource.getSingleDescription() + ": ";
if (isObjectEditable(object)) { if (isObjectEditable(object)) {
title += "редактирование"; title += "редактирование";
} else { } else {
@@ -528,9 +522,9 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
return dialog.ShowDialog(title, object); return dialog.ShowDialog(title, object);
} }
public boolean ShowDeleteObjectDialog(D object) { public boolean ShowDeleteObjectDialog(D object) {
return UI.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)"); return UI.Warning(dataSource.getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");
} }
public boolean ShowDeleteObjectsDialog(int toDeleteCount) { public boolean ShowDeleteObjectsDialog(int toDeleteCount) {
return UI.Warning(getPluralDescription() + " в количестве " + toDeleteCount + " будут удалены)"); return UI.Warning(dataSource.getPluralDescription() + " в количестве " + toDeleteCount + " будут удалены)");
} }
} }

View File

@@ -19,6 +19,14 @@ public class CompilersDBTable extends iDBTable<Compiler> {
super(Compiler.class); super(Compiler.class);
} }
@Override @Override
public String getSingleDescription() {
return "компилятор";
}
@Override
public String getPluralDescription() {
return "компиляторы";
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() { public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>(); LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(Makefile.class, new FKBehaviour(FKDataBehaviour.DROP, FKCurrentObjectBehaviuor.PASSIVE)); res.put(Makefile.class, new FKBehaviour(FKDataBehaviour.DROP, FKCurrentObjectBehaviuor.PASSIVE));

View File

@@ -19,14 +19,6 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
return Current.Compiler; return Current.Compiler;
} }
@Override @Override
protected String getSingleDescription() {
return "компилятор";
}
@Override
protected String getPluralDescription() {
return "компиляторы";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -68,7 +60,7 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.AddCompiler, return new DataMenuBar(dataSource.getPluralDescription(), PassCode.AddCompiler,
PassCode.EditCompiler, PassCode.EditCompiler,
PassCode.DeleteCompiler, PassCode.DeleteCompiler,
PassCode.ShowCompilerVersion, PassCode.ShowCompilerVersion,

View File

@@ -11,6 +11,14 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
super(DVMParameter.class); super(DVMParameter.class);
} }
@Override @Override
public String getSingleDescription() {
return "параметр DVM системы";
}
@Override
public String getPluralDescription() {
return "параметры DVM";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DVMParametersForm(this, mountPanel); return new DVMParametersForm(this, mountPanel);
} }

View File

@@ -18,14 +18,6 @@ public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
return Current.DVMParameterValue; return Current.DVMParameterValue;
} }
@Override @Override
protected String getSingleDescription() {
return "параметр DVM системы";
}
@Override
protected String getPluralDescription() {
return "параметры DVM";
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"имя", "имя",
@@ -48,7 +40,7 @@ public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddDVMParameter, PassCode.AddDVMParameter,
PassCode.EditDVMParameter, PassCode.EditDVMParameter,
PassCode.DeleteDVMParameter); PassCode.DeleteDVMParameter);

View File

@@ -11,6 +11,14 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
super(EnvironmentValue.class); super(EnvironmentValue.class);
} }
@Override @Override
public String getSingleDescription() {
return "переменная окружения";
}
@Override
public String getPluralDescription() {
return "переменные окружения";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new EnvironmentsValuesForm(this, mountPanel); return new EnvironmentsValuesForm(this, mountPanel);
} }

View File

@@ -19,14 +19,6 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
return Current.EnvironmentValue; return Current.EnvironmentValue;
} }
@Override @Override
protected String getSingleDescription() {
return "переменная окружения";
}
@Override
protected String getPluralDescription() {
return "переменные окружения";
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"имя", "имя",
@@ -48,7 +40,7 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddEnvironmentValue, PassCode.AddEnvironmentValue,
PassCode.EditEnvironmentValue, PassCode.EditEnvironmentValue,
PassCode.DeleteEnvironmentValue, PassCode.DeleteEnvironmentValue,

View File

@@ -25,6 +25,14 @@ public class MachinesDBTable extends iDBTable<Machine> {
super(Machine.class); super(Machine.class);
} }
@Override @Override
public String getSingleDescription() {
return "машина";
}
@Override
public String getPluralDescription() {
return "машины";
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() { public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>(); LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
//- //-

View File

@@ -22,14 +22,6 @@ public class MachinesForm extends DataSetControlForm<Machine> {
return Current.Machine; return Current.Machine;
} }
@Override @Override
protected String getSingleDescription() {
return "машина";
}
@Override
protected String getPluralDescription() {
return "машины";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -64,7 +56,7 @@ public class MachinesForm extends DataSetControlForm<Machine> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddMachine, PassCode.AddMachine,
PassCode.EditMachine, PassCode.EditMachine,
PassCode.DeleteMachine) { PassCode.DeleteMachine) {

View File

@@ -18,6 +18,14 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
super(Makefile.class); super(Makefile.class);
} }
@Override @Override
public String getSingleDescription() {
return "мейкфайл";
}
@Override
public String getPluralDescription() {
return "мейкфайлы";
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() { public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>(); LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(Module.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE)); res.put(Module.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));

View File

@@ -20,14 +20,6 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
return Current.Makefile; return Current.Makefile;
} }
@Override @Override
protected String getSingleDescription() {
return "мейкфайл";
}
@Override
protected String getPluralDescription() {
return "мейкфайлы";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -58,7 +50,7 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.Compile, PassCode.Compile,
PassCode.AddMakefile, PassCode.AddMakefile,
PassCode.EditMakefile, PassCode.EditMakefile,

View File

@@ -9,6 +9,14 @@ public class ModulesDBTable extends iDBTable<Module> {
super(Module.class); super(Module.class);
} }
@Override @Override
public String getSingleDescription() {
return "языковой модуль";
}
@Override
public String getPluralDescription() {
return "языковые модули";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new ModulesForm(this, mountPanel); return new ModulesForm(this, mountPanel);
} }

View File

@@ -19,14 +19,6 @@ public class ModulesForm extends DataSetControlForm<Module> {
return Current.Module; return Current.Module;
} }
@Override @Override
protected String getSingleDescription() {
return "языковой модуль";
}
@Override
protected String getPluralDescription() {
return "языковые модули";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -60,7 +52,7 @@ public class ModulesForm extends DataSetControlForm<Module> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.EditModule); return new DataMenuBar(dataSource.getPluralDescription(), PassCode.EditModule);
} }
@Override @Override
public boolean isObjectVisible(Module object) { public boolean isObjectVisible(Module object) {

View File

@@ -19,6 +19,14 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
super(RunConfiguration.class); super(RunConfiguration.class);
} }
@Override @Override
public String getSingleDescription() {
return "конфигурация запуска";
}
@Override
public String getPluralDescription() {
return "конфигурации запуска";
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() { public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>(); LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(RunTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE)); res.put(RunTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));

View File

@@ -18,14 +18,6 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
return Current.RunConfiguration; return Current.RunConfiguration;
} }
@Override @Override
protected String getSingleDescription() {
return "конфигурация запуска";
}
@Override
protected String getPluralDescription() {
return "конфигурации запуска";
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Команда", "Команда",
@@ -64,7 +56,7 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.Run, PassCode.Run,
PassCode.AddRunConfiguration, PassCode.AddRunConfiguration,
PassCode.EditRunConfiguration, PassCode.EditRunConfiguration,

View File

@@ -17,6 +17,14 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
super(SapforProfile.class); super(SapforProfile.class);
} }
@Override @Override
public String getPluralDescription() {
return "профили SAPFOR";
}
@Override
public String getSingleDescription() {
return "профиль SAPFOR";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforProfilesForm(this, mountPanel); return new SapforProfilesForm(this, mountPanel);
} }

View File

@@ -19,14 +19,6 @@ public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
return Current.SapforProfile; return Current.SapforProfile;
} }
@Override @Override
protected String getPluralDescription() {
return "профили SAPFOR";
}
@Override
protected String getSingleDescription() {
return "профиль SAPFOR";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -50,7 +42,7 @@ public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SaveProfile, PassCode.SaveProfile,
PassCode.EditProfile, PassCode.EditProfile,
PassCode.ApplyProfile, PassCode.ApplyProfile,

View File

@@ -17,6 +17,14 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
super(CompilationTask.class); super(CompilationTask.class);
} }
@Override @Override
public String getSingleDescription() {
return "задача на компиляцию";
}
@Override
public String getPluralDescription() {
return "задачи на компиляцию";
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() { public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>(); LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(RunTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE)); res.put(RunTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));

View File

@@ -20,14 +20,6 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
return Current.CompilationTask; return Current.CompilationTask;
} }
@Override @Override
protected String getSingleDescription() {
return "задача на компиляцию";
}
@Override
protected String getPluralDescription() {
return "задачи на компиляцию";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -65,7 +57,7 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteCompilationTasks); return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteCompilationTasks);
} }
@Override @Override
public boolean isObjectVisible(CompilationTask object) { public boolean isObjectVisible(CompilationTask object) {

View File

@@ -11,6 +11,14 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
super(RunTask.class); super(RunTask.class);
} }
@Override @Override
public String getSingleDescription() {
return "задача на запуск";
}
@Override
public String getPluralDescription() {
return "задачи на запуск";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new RunTasksForm(this, mountPanel); return new RunTasksForm(this, mountPanel);
} }

View File

@@ -20,14 +20,6 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
return Current.RunTask; return Current.RunTask;
} }
@Override @Override
protected String getSingleDescription() {
return "задача на запуск";
}
@Override
protected String getPluralDescription() {
return "задачи на запуск";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -77,7 +69,7 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteRunTasks); return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteRunTasks);
} }
@Override @Override
public boolean isObjectVisible(RunTask object) { public boolean isObjectVisible(RunTask object) {

View File

@@ -20,14 +20,6 @@ public class UsersForm extends DataSetControlForm<User> {
return Current.User; return Current.User;
} }
@Override @Override
protected String getSingleDescription() {
return "пользователь";
}
@Override
protected String getPluralDescription() {
return "пользователи";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -65,7 +57,7 @@ public class UsersForm extends DataSetControlForm<User> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddUser, PassCode.AddUser,
PassCode.EditUser, PassCode.EditUser,
PassCode.InitialiseUser, PassCode.InitialiseUser,

View File

@@ -18,6 +18,14 @@ public class UsersDBTable extends iDBTable<User> {
super(User.class); super(User.class);
} }
@Override @Override
public String getSingleDescription() {
return "пользователь";
}
@Override
public String getPluralDescription() {
return "пользователи";
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() { public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>(); LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(CompilationTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE)); res.put(CompilationTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));

View File

@@ -9,6 +9,14 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
super(String.class, DBArray.class); super(String.class, DBArray.class);
} }
@Override @Override
public String getSingleDescription() {
return "массив";
}
@Override
public String getPluralDescription() {
return "сохранённые состояния";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DBArraysForm(this, mountPanel); return new DBArraysForm(this, mountPanel);
} }

View File

@@ -15,14 +15,6 @@ public class DBArraysForm extends DataSetControlForm<DBArray> {
return Current.DBArray; return Current.DBArray;
} }
@Override @Override
protected String getSingleDescription() {
return "массив";
}
@Override
protected String getPluralDescription() {
return "сохранённые состояния";
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{"Имя"}; return new String[]{"Имя"};
} }
@@ -47,7 +39,7 @@ public class DBArraysForm extends DataSetControlForm<DBArray> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()) { return new DataMenuBar(dataSource.getPluralDescription()) {
@Override @Override
public void createSelectionButtons(DataSet dataSet) { public void createSelectionButtons(DataSet dataSet) {
//не нужны. //не нужны.

View File

@@ -9,6 +9,14 @@ public class ProjectArraysSet extends DataSet<Long, ProjectArray> {
super(Long.class, ProjectArray.class); super(Long.class, ProjectArray.class);
} }
@Override @Override
public String getSingleDescription() {
return "массив";
}
@Override
public String getPluralDescription() {
return "объявленные массивы";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new ProjectArraysForm(this, mountPanel); return new ProjectArraysForm(this, mountPanel);
} }

View File

@@ -29,14 +29,6 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
return Current.ProjectArray; return Current.ProjectArray;
} }
@Override @Override
protected String getSingleDescription() {
return "массив";
}
@Override
protected String getPluralDescription() {
return "объявленные массивы";
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Имя", "Имя",

View File

@@ -11,6 +11,14 @@ public class ParallelRegionsSet extends DataSet<BigInteger, ParallelRegion> {
super(BigInteger.class, ParallelRegion.class); super(BigInteger.class, ParallelRegion.class);
} }
@Override @Override
public String getSingleDescription() {
return "область распараллеливания";
}
@Override
public String getPluralDescription() {
return "области распараллеливания";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new ParallelRegionsForm(this, mountPanel); return new ParallelRegionsForm(this, mountPanel);
} }

View File

@@ -16,14 +16,6 @@ public class ParallelRegionsForm extends DataSetControlForm<ParallelRegion> {
return Current.ParallelRegionInfo; return Current.ParallelRegionInfo;
} }
@Override @Override
protected String getSingleDescription() {
return "область распараллеливания";
}
@Override
protected String getPluralDescription() {
return "области распараллеливания";
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Имя", "Имя",

View File

@@ -9,6 +9,10 @@ public class ParallelVariantsSet extends DataSet<String, ParallelVariant> {
super(String.class, ParallelVariant.class); super(String.class, ParallelVariant.class);
} }
@Override @Override
public String getPluralDescription() {
return "варианты";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new ParallelVariantsForm(this, mountPanel); return new ParallelVariantsForm(this, mountPanel);
} }

View File

@@ -19,10 +19,6 @@ public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
return Current.ParallelVariant; return Current.ParallelVariant;
} }
@Override @Override
protected String getPluralDescription() {
return "варианты";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -84,7 +80,7 @@ public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.ShowAllParallelVariants, PassCode.ShowAllParallelVariants,
PassCode.ShowParallelVariantsCoverage, PassCode.ShowParallelVariantsCoverage,
PassCode.PredictParallelVariants, PassCode.PredictParallelVariants,

View File

@@ -13,6 +13,14 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
super(String.class, BugReport.class); super(String.class, BugReport.class);
} }
@Override @Override
public String getSingleDescription() {
return "отчёт об ошибке";
}
@Override
public String getPluralDescription() {
return "отчёты об ошибках";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new BugReportsForm(this, mountPanel); return new BugReportsForm(this, mountPanel);
} }

View File

@@ -35,14 +35,6 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
return Current.BugReport; return Current.BugReport;
} }
@Override @Override
protected String getSingleDescription() {
return "отчёт об ошибке";
}
@Override
protected String getPluralDescription() {
return "отчёты об ошибках";
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Описание", "Описание",
@@ -92,7 +84,7 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SynchronizeBugReports, PassCode.SynchronizeBugReports,
PassCode.DownloadAllBugReportsArchives, PassCode.DownloadAllBugReportsArchives,
PassCode.AddBugReport, PassCode.AddBugReport,

View File

@@ -9,6 +9,14 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
super(ComponentType.class, Component.class); super(ComponentType.class, Component.class);
} }
@Override @Override
public String getSingleDescription() {
return "компонент";
}
@Override
public String getPluralDescription() {
return "компоненты";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new ComponentsForm(this, mountPanel); return new ComponentsForm(this, mountPanel);
} }

View File

@@ -23,14 +23,6 @@ public class ComponentsForm extends DataSetControlForm<Component> {
return Current.Component; return Current.Component;
} }
@Override @Override
protected String getSingleDescription() {
return "компонент";
}
@Override
protected String getPluralDescription() {
return "компоненты";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -69,7 +61,7 @@ public class ComponentsForm extends DataSetControlForm<Component> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.InstallComponentFromFolder, return new DataMenuBar(dataSource.getPluralDescription(), PassCode.InstallComponentFromFolder,
PassCode.UpdateSelectedComponents, PassCode.UpdateSelectedComponents,
PassCode.PublishComponent, PassCode.PublishComponent,
PassCode.ShowComponentChangesLog) { PassCode.ShowComponentChangesLog) {
@@ -84,7 +76,7 @@ public class ComponentsForm extends DataSetControlForm<Component> {
} }
} }
); );
Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false); MainModule_.instance.getPass(PassCode.PublishComponent).setControlsVisible(false);
} }
}; };
} }

View File

@@ -10,6 +10,14 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
public SubscriberWorkspaceDBTable() { public SubscriberWorkspaceDBTable() {
super(SubscriberWorkspace.class); super(SubscriberWorkspace.class);
} }
@Override
public String getSingleDescription() {
return "рабочая папка";
}
@Override
public String getPluralDescription() {
return "рабочие папки";
}
public SubscriberWorkspace findWorkspace(String email, String machineURL, String login) { public SubscriberWorkspace findWorkspace(String email, String machineURL, String login) {
return this.Data.values().stream().filter(subscriberWorkspace -> return this.Data.values().stream().filter(subscriberWorkspace ->
subscriberWorkspace.email.equals(email) && subscriberWorkspace.email.equals(email) &&

View File

@@ -17,14 +17,6 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
return Current.SubscriberWorkspace; return Current.SubscriberWorkspace;
} }
@Override @Override
protected String getSingleDescription() {
return "рабочая папка";
}
@Override
protected String getPluralDescription() {
return "рабочие папки";
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"URL", "URL",
@@ -45,7 +37,7 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteSubscriberWorkspace); return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
} }
@Override @Override
public boolean isObjectVisible(SubscriberWorkspace object) { public boolean isObjectVisible(SubscriberWorkspace object) {

View File

@@ -17,6 +17,14 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
super(String.class, Subscriber.class); super(String.class, Subscriber.class);
} }
@Override @Override
public String getSingleDescription() {
return "адресат";
}
@Override
public String getPluralDescription() {
return "адресаты";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new SubsribersForm(this, mountPanel); return new SubsribersForm(this, mountPanel);
} }

View File

@@ -20,14 +20,6 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
return Current.Subscriber; return Current.Subscriber;
} }
@Override @Override
protected String getSingleDescription() {
return "адресат";
}
@Override
protected String getPluralDescription() {
return "адресаты";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -60,7 +52,7 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SaveBugReportExecutor, PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportRecipients, PassCode.SaveBugReportRecipients,
PassCode.AddSubscriber, PassCode.AddSubscriber,

View File

@@ -20,6 +20,14 @@ public class GroupsDBTable extends iDBTable<Group> {
} }
//------------------------------------------------>>> //------------------------------------------------>>>
@Override @Override
public String getSingleDescription() {
return "группа тестов";
}
@Override
public String getPluralDescription() {
return "группы";
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() { public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>(); LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(Test.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE)); res.put(Test.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));

View File

@@ -26,14 +26,6 @@ public class GroupsForm extends DataSetControlForm<Group> {
return Current.Group; return Current.Group;
} }
@Override @Override
protected String getSingleDescription() {
return "группа тестов";
}
@Override
protected String getPluralDescription() {
return "группы";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -63,7 +55,7 @@ public class GroupsForm extends DataSetControlForm<Group> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SynchronizeTests, PassCode.SynchronizeTests,
PassCode.ConvertCorrectnessTests) { PassCode.ConvertCorrectnessTests) {
{ {

View File

@@ -13,6 +13,14 @@ public class TestDBTable extends iDBTable<Test> {
super(Test.class); super(Test.class);
} }
@Override @Override
public String getSingleDescription() {
return "тест";
}
@Override
public String getPluralDescription() {
return "тесты";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new TestsForm(this, mountPanel); return new TestsForm(this, mountPanel);
} }

View File

@@ -18,14 +18,6 @@ public class TestsForm extends DataSetControlForm<Test> {
return Current.Test; return Current.Test;
} }
@Override @Override
protected String getSingleDescription() {
return "тест";
}
@Override
protected String getPluralDescription() {
return "тесты";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -58,7 +50,7 @@ public class TestsForm extends DataSetControlForm<Test> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()) { return new DataMenuBar(dataSource.getPluralDescription()) {
{ {
addMenus(new AddTestMenu(), new EditTestMenu()); addMenus(new AddTestMenu(), new EditTestMenu());
addPasses(PassCode.DownloadTest, PassCode.DeleteTest); addPasses(PassCode.DownloadTest, PassCode.DeleteTest);

View File

@@ -11,6 +11,14 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
super(DVMConfiguration.class); super(DVMConfiguration.class);
} }
@Override @Override
public String getSingleDescription() {
return "конфигурация";
}
@Override
public String getPluralDescription() {
return "конфигурации";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DVMConfigurationsForm(this, mountPanel); return new DVMConfigurationsForm(this, mountPanel);
} }

View File

@@ -21,14 +21,6 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
return Current.DVMConfiguration; return Current.DVMConfiguration;
} }
@Override @Override
protected String getSingleDescription() {
return "конфигурация";
}
@Override
protected String getPluralDescription() {
return "конфигурации";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -76,7 +68,7 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.PublishConfiguration, PassCode.PublishConfiguration,
PassCode.EditConfiguration, PassCode.EditConfiguration,
PassCode.ShowCurrentDVMConfigurationTests, PassCode.ShowCurrentDVMConfigurationTests,

View File

@@ -11,6 +11,14 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
super(DVMPackage.class); super(DVMPackage.class);
} }
@Override @Override
public String getSingleDescription() {
return "пакет";
}
@Override
public String getPluralDescription() {
return "пакеты";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DVMPackagesForm(this, mountPanel); return new DVMPackagesForm(this, mountPanel);
} }

View File

@@ -27,14 +27,6 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
return Current.DVMPackage; return Current.DVMPackage;
} }
@Override @Override
protected String getSingleDescription() {
return "пакет";
}
@Override
protected String getPluralDescription() {
return "пакеты";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -112,7 +104,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()) { return new DataMenuBar(dataSource.getPluralDescription()) {
{ {
addPasses(PassCode.SynchronizeTests); addPasses(PassCode.SynchronizeTests);
addSeparator(); addSeparator();

View File

@@ -11,6 +11,14 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
super(DVMSettings.class); super(DVMSettings.class);
} }
@Override @Override
public String getSingleDescription() {
return "параметры тестирования";
}
@Override
public String getPluralDescription() {
return "параметры тестирования";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DVMSettingsForm(this, mountPanel); return new DVMSettingsForm(this, mountPanel);
} }

View File

@@ -18,14 +18,6 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
return Current.DVMSettings; return Current.DVMSettings;
} }
@Override @Override
protected String getSingleDescription() {
return "параметры тестирования";
}
@Override
protected String getPluralDescription() {
return "параметры тестирования";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -70,7 +62,7 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.PublishDVMSettings, PassCode.PublishDVMSettings,
PassCode.CloneDVMSettings, PassCode.CloneDVMSettings,
PassCode.EditDVMSettings, PassCode.EditDVMSettings,

View File

@@ -6,12 +6,19 @@ import _VisualDVM.TestingSystem.DVM.DVMTasks.UI.DVMRunTasksForm;
import javax.swing.*; import javax.swing.*;
public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> { public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
//todo обобщить бы наличие фильтров для всех таблиц.
DVMPackage target; DVMPackage target;
public DVMRunTasksSet() { public DVMRunTasksSet() {
super(Integer.class, DVMRunTask.class); super(Integer.class, DVMRunTask.class);
} }
@Override @Override
public String getSingleDescription() {
return "задача";
}
@Override
public String getPluralDescription() {
return "задачи";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DVMRunTasksForm(this, mountPanel); return new DVMRunTasksForm(this, mountPanel);
} }

View File

@@ -23,14 +23,6 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
return Current.DVMRunTask; return Current.DVMRunTask;
} }
@Override @Override
protected String getSingleDescription() {
return "задача";
}
@Override
protected String getPluralDescription() {
return "задачи";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -90,7 +82,7 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest); return new DataMenuBar(dataSource.getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
} }
@Override @Override
protected void createFilters() { protected void createFilters() {

View File

@@ -13,6 +13,14 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
super(SapforConfiguration.class); super(SapforConfiguration.class);
} }
@Override @Override
public String getSingleDescription() {
return "конфигурация";
}
@Override
public String getPluralDescription() {
return "конфигурации";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforConfigurationsForm(this, mountPanel); return new SapforConfigurationsForm(this, mountPanel);
} }

View File

@@ -22,14 +22,6 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
return Current.SapforConfiguration; return Current.SapforConfiguration;
} }
@Override @Override
protected String getSingleDescription() {
return "конфигурация";
}
@Override
protected String getPluralDescription() {
return "конфигурации";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -79,7 +71,7 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.PublishSapforConfiguration, PassCode.PublishSapforConfiguration,
PassCode.EditSapforConfiguration, PassCode.EditSapforConfiguration,
PassCode.ShowCurrentSAPFORConfigurationTests, PassCode.ShowCurrentSAPFORConfigurationTests,

View File

@@ -11,6 +11,14 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
super(SapforPackage.class); super(SapforPackage.class);
} }
@Override @Override
public String getSingleDescription() {
return "пакет";
}
@Override
public String getPluralDescription() {
return "пакеты";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforPackagesForm(this, mountPanel); return new SapforPackagesForm(this, mountPanel);
} }

View File

@@ -27,14 +27,6 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
return Current.SapforPackage; return Current.SapforPackage;
} }
@Override @Override
protected String getSingleDescription() {
return "пакет";
}
@Override
protected String getPluralDescription() {
return "пакеты";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -92,7 +84,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.SynchronizeTests) { return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SynchronizeTests) {
{ {
addSeparator(); addSeparator();
addPasses(PassCode.AbortSapforPackage); addPasses(PassCode.AbortSapforPackage);

View File

@@ -17,6 +17,14 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
super(SapforSettings.class); super(SapforSettings.class);
} }
@Override @Override
public String getSingleDescription() {
return "параметры тестирования";
}
@Override
public String getPluralDescription() {
return "параметры тестирования";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforSettingsForm(this, mountPanel); return new SapforSettingsForm(this, mountPanel);
} }

View File

@@ -17,14 +17,6 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
return Current.SapforSettings; return Current.SapforSettings;
} }
@Override @Override
protected String getSingleDescription() {
return "параметры тестирования";
}
@Override
protected String getPluralDescription() {
return "параметры тестирования";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -51,7 +43,7 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.PublishSapforSettings, PassCode.PublishSapforSettings,
PassCode.CloneSapforSettings, PassCode.CloneSapforSettings,
PassCode.EditSapforSettings, PassCode.EditSapforSettings,

View File

@@ -13,6 +13,14 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
super(SapforSettingsCommand.class); super(SapforSettingsCommand.class);
} }
@Override @Override
public String getSingleDescription() {
return "команда";
}
@Override
public String getPluralDescription() {
return "команды";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforSettingsCommandsForm(this, mountPanel); return new SapforSettingsCommandsForm(this, mountPanel);
} }

View File

@@ -18,14 +18,6 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
return Current.SapforSettingsCommand; return Current.SapforSettingsCommand;
} }
@Override @Override
protected String getSingleDescription() {
return "команда";
}
@Override
protected String getPluralDescription() {
return "команды";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -46,7 +38,7 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.PublishSapforSettingsCommand, PassCode.PublishSapforSettingsCommand,
PassCode.EditSapforSettingsCommand, PassCode.EditSapforSettingsCommand,
PassCode.DeleteSapforSettingsCommand); PassCode.DeleteSapforSettingsCommand);

View File

@@ -11,6 +11,14 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
super(ServerSapfor.class); super(ServerSapfor.class);
} }
@Override @Override
public String getSingleDescription() {
return "версия SAPFOR";
}
@Override
public String getPluralDescription() {
return "версии SAPFOR";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new ServerSapforsForm(this, mountPanel); return new ServerSapforsForm(this, mountPanel);
} }

View File

@@ -20,14 +20,6 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
return Current.ServerSapfor; return Current.ServerSapfor;
} }
@Override @Override
protected String getSingleDescription() {
return "версия SAPFOR";
}
@Override
protected String getPluralDescription() {
return "версии SAPFOR";
}
@Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return true; return true;
} }
@@ -71,7 +63,7 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.CompileServerSapfor, PassCode.CompileServerSapfor,
PassCode.ShowSapforCompilationOut, PassCode.ShowSapforCompilationOut,
PassCode.ShowSapforCompilationErr, PassCode.ShowSapforCompilationErr,